Mus Browser Tests

chrome/test/base/mojo_test_connector.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_
 #define CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_
 
 #include <memory>
 
 #include "base/macros.h"
@@ skipping 24 matching lines @@
 // PrepareForTest() is called from content::TestLauncherDelegate::PreRunTest().
 class MojoTestConnector {
  public:
   // Switch added to command line of each test.
   static const char kTestSwitch[];
 
   // Command line switch added to all apps that are expected to be provided by
   // 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.
   service_manager::mojom::ServiceRequest Init();
 
   std::unique_ptr<content::TestState> PrepareForTest(
       base::CommandLine* command_line,
       base::TestLauncher::LaunchOptions* test_launch_options);
 
  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>
       background_service_manager_;
 
   std::unique_ptr<base::Thread> ipc_thread_;
   std::unique_ptr<mojo::edk::ScopedIPCSupport> ipc_support_;
 
   std::unique_ptr<base::Value> catalog_contents_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoTestConnector);
 };
 
 #endif  // CHROME_TEST_BASE_MOJO_TEST_CONNECTOR_H_