Removes WebContentsViewMus/RenderWidgetHostViewMus

mash/package/mash_packaged_service.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 "mash/package/mash_packaged_service.h"
 
 #include "base/base_switches.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
+#include "base/process/process.h"
 #include "mash/catalog_viewer/catalog_viewer.h"
 #include "mash/catalog_viewer/public/interfaces/constants.mojom.h"
 #include "mash/quick_launch/public/interfaces/constants.mojom.h"
 #include "mash/quick_launch/quick_launch.h"
 #include "mash/session/public/interfaces/constants.mojom.h"
 #include "mash/session/session.h"
 #include "mash/task_viewer/public/interfaces/constants.mojom.h"
 #include "mash/task_viewer/task_viewer.h"
 #include "services/service_manager/public/cpp/interface_registry.h"
 #include "services/service_manager/public/cpp/service_context.h"
@@ skipping 47 matching lines @@
   NOTREACHED();
 }
 
 // Please see header file for details on adding new services.
 std::unique_ptr<service_manager::Service> MashPackagedService::CreateService(
     const std::string& name) {
   const std::string debugger_target =
       base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
           switches::kWaitForDebugger);
   if (!debugger_target.empty()) {
-    const size_t index = name.find(':');
-    if (index != std::string::npos &&
-        name.substr(index + 1) == debugger_target) {
-      LOG(WARNING) << "waiting for debugger to attach for service " << name;
+    if (name == debugger_target) {
+      LOG(WARNING) << "waiting for debugger to attach for service " << name
+                   << " pid=" << base::Process::Current().Pid();
       base::debug::WaitForDebugger(120, true);
     }
   }
 
 #if defined(OS_CHROMEOS)
   if (name == "ash")
     return base::WrapUnique(new ash::mus::WindowManagerApplication);
   if (name == "accessibility_autoclick")
     return base::WrapUnique(new ash::autoclick::AutoclickApplication);
   if (name == "touch_hud")
@@ skipping 12 matching lines @@
   if (name == "test_ime_driver")
     return base::WrapUnique(new ui::test::TestIMEApplication);
 #if defined(OS_LINUX)
   if (name == "font_service")
     return base::WrapUnique(new font_service::FontServiceApp);
 #endif
   return nullptr;
 }
 
 }  // namespace mash