Skip to content

Commit

Permalink
Use mash::session::mojom::kServiceName instead of a hardcoded string
Browse files Browse the repository at this point in the history
chrome/test/base/mash_browser_tests_main.cc is the only place where
the hardcoded string "mash_session" is used. This CL replaces it with
the Mojo constant mash::session::mojom::kServiceName.

R=sky@chromium.org
BUG=None

Review-Url: https://codereview.chromium.org/2713223002
Cr-Commit-Position: refs/heads/master@{#452884}
  • Loading branch information
fred-wang authored and Commit bot committed Feb 24, 2017
1 parent 4b09589 commit d5bd4ec
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 1 deletion.
1 change: 1 addition & 0 deletions chrome/test/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -1194,6 +1194,7 @@ static_library("browser_tests_runner") {

deps += [
"//mash/package",
"//mash/session/public/interfaces:constants",
"//services/service_manager/background:lib",
]

Expand Down
1 change: 1 addition & 0 deletions chrome/test/DEPS
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ include_rules = [
"+device/geolocation",
"+extensions",
"+mash/package",
"+mash/session/public/interfaces",
"+mojo",
"+rlz/features",
"+services",
Expand Down
3 changes: 2 additions & 1 deletion chrome/test/base/mash_browser_tests_main.cc
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@
#include "content/public/common/service_manager_connection.h"
#include "content/public/test/test_launcher.h"
#include "mash/package/mash_packaged_service.h"
#include "mash/session/public/interfaces/constants.mojom.h"
#include "services/service_manager/public/cpp/connector.h"
#include "services/service_manager/public/cpp/service.h"
#include "services/service_manager/public/cpp/service_context.h"
Expand All @@ -43,7 +44,7 @@ const base::FilePath::CharType kCatalogFilename[] =
FILE_PATH_LITERAL("mash_browser_tests_catalog.json");

void ConnectToDefaultApps(service_manager::Connector* connector) {
connector->Connect("mash_session");
connector->Connect(mash::session::mojom::kServiceName);
}

class MashTestSuite : public ChromeTestSuite {
Expand Down

0 comments on commit d5bd4ec

Please sign in to comment.