Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1793)

Unified Diff: chrome/test/base/mash_browser_tests_main.cc

Issue 2719983002: Mash Session: Do not launch a browser service at startup (Closed)
Patch Set: Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | mash/session/session.cc » ('j') | mash/session/session.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/mash_browser_tests_main.cc
diff --git a/chrome/test/base/mash_browser_tests_main.cc b/chrome/test/base/mash_browser_tests_main.cc
index bc097e1f49248ac741c21c3c723babb943fb1d55..a3d094de35e3be54c4614212103eab4263f27a3a 100644
--- a/chrome/test/base/mash_browser_tests_main.cc
+++ b/chrome/test/base/mash_browser_tests_main.cc
@@ -25,6 +25,7 @@
#include "chrome/test/base/mojo_test_connector.h"
#include "content/public/app/content_main.h"
#include "content/public/common/service_manager_connection.h"
+#include "content/public/common/service_names.mojom.h"
#include "content/public/test/test_launcher.h"
#include "mash/package/mash_packaged_service.h"
#include "mash/session/public/interfaces/constants.mojom.h"
@@ -45,6 +46,7 @@ const base::FilePath::CharType kCatalogFilename[] =
void ConnectToDefaultApps(service_manager::Connector* connector) {
connector->Connect(mash::session::mojom::kServiceName);
+ connector->Connect(content::mojom::kPackagedServicesServiceName);
sky 2017/02/28 04:17:57 Why are you changing this?
fwang 2017/02/28 07:06:51 This is only to preserve the behavior that browser
}
class MashTestSuite : public ChromeTestSuite {
« no previous file with comments | « no previous file | mash/session/session.cc » ('j') | mash/session/session.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698