Stop Nesting Test Suites in mash_browser_tests

chrome/test/base/mash_browser_tests_main.cc

 // 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.
 
 #include <algorithm>
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/debug/stack_trace.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/i18n/icu_util.h"
 #include "base/json/json_reader.h"
 #include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/run_loop.h"
 #include "base/sys_info.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "base/values.h"
 #include "chrome/app/mash/embedded_services.h"
 #include "chrome/test/base/chrome_test_launcher.h"
 #include "chrome/test/base/chrome_test_suite.h"
 #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/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"
 #include "services/service_manager/public/cpp/service_runner.h"
 #include "services/service_manager/public/cpp/standalone_service/standalone_service.h"
 #include "services/service_manager/runner/common/switches.h"
 #include "services/service_manager/runner/init.h"
 #include "services/ui/common/switches.h"
@@ skipping 130 matching lines @@
   run_loop.Run();
 }
 
 }  // namespace
 
 bool RunMashBrowserTests(int argc, char** argv, int* exit_code) {
   base::CommandLine::Init(argc, argv);
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   if (!command_line->HasSwitch("run-in-mash") &&
       !command_line->HasSwitch("run-in-mus")) {
+    // Currently launching content_package_services via the browser_tests binary
+    // will lead to a nested test suite, trying to run all tests again. However
+    // they will be in a strange mixed mode, of a local-Ash, but non-local Aura.
+    //
+    // This leads to continuous crashes in OzonePlatform.
+    //
+    // For now disable this launch until the requesting site can be identified.
+    //
+    // TODO(jonross): find an appropriate way to launch content_package_services
+    // within the mash_browser_tests (crbug.com/738449)
+    if (command_line->GetSwitchValueASCII("service-name") ==
+        content::mojom::kPackagedServicesServiceName) {
+      return true;
+    }
     return false;
   }
 
   if (command_line->HasSwitch(MojoTestConnector::kMashApp)) {
 #if defined(OS_LINUX)
     base::AtExitManager exit_manager;
 #endif
     base::i18n::InitializeICU();
 
 #if !defined(OFFICIAL_BUILD)
@@ skipping 20 matching lines @@
   if (command_line->HasSwitch(content::kSingleProcessTestsFlag) &&
       !command_line->HasSwitch(service_manager::switches::kServicePipeToken)) {
     service_manager_connection_factory =
         base::Bind(&CreateServiceManagerConnection, &delegate);
     content::ServiceManagerConnection::SetFactoryForTest(
         &service_manager_connection_factory);
   }
   *exit_code = LaunchChromeTests(default_jobs, &delegate, argc, argv);
   return true;
 }