Mus Browser Tests

chrome/test/base/mojo_test_connector.h

Index: chrome/test/base/mojo_test_connector.h
diff --git a/chrome/test/base/mojo_test_connector.h b/chrome/test/base/mojo_test_connector.h
index abaf89ce5acba8c5d1bd7b4763232142ed9f8624..f49fbd2c1949d401713189ca2766f2777bb19c6a 100644
--- a/chrome/test/base/mojo_test_connector.h
+++ b/chrome/test/base/mojo_test_connector.h
@@ -42,7 +42,19 @@ class MojoTestConnector {
   // browser_tests.
   static const char kMashApp[];
 
-  explicit MojoTestConnector(std::unique_ptr<base::Value> catalog_contents);
+  // Enumeration of the possible chrome-ash configurations supported by this
+  // test.
+  enum class Config {
+    // Aura is backed by mus, but chrome and ash are still in the same process.
+    MUS,
+
+    // Aura is backed by mus and chrome and ash are in separate processes. In
+    // this mode chrome code can only use ash code in ash/public/cpp.
+    MASH,
+  };
+
+  explicit MojoTestConnector(std::unique_ptr<base::Value> catalog_contents,

[sky, 2017/04/20 20:52:58]

remove explicit

[jonross, 2017/04/21 14:04:21]

Done.

+                             Config config);
   ~MojoTestConnector();
 
   // Initializes the background thread the ServiceManager runs on.
@@ -55,6 +67,8 @@ class MojoTestConnector {
  private:
   class ServiceProcessLauncherDelegateImpl;
 
+  Config config_;

[sky, 2017/04/20 20:52:58]

const

[jonross, 2017/04/21 14:04:21]

Done.

+
   std::unique_ptr<ServiceProcessLauncherDelegateImpl>
       service_process_launcher_delegate_;
   std::unique_ptr<service_manager::BackgroundServiceManager>