Rename shell namespace to service_manager

chrome/browser/ui/views/chrome_browser_main_extra_parts_views.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/views/chrome_browser_main_extra_parts_views.h"
 
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
 #include "chrome/browser/ui/views/chrome_views_delegate.h"
 #include "components/constrained_window/constrained_window_views.h"
 
@@ skipping 37 matching lines @@
   // The screen may have already been set in test initialization.
   if (!display::Screen::GetScreen())
     display::Screen::SetScreenInstance(views::CreateDesktopScreen());
 #endif
 }
 
 void ChromeBrowserMainExtraPartsViews::ServiceManagerConnectionStarted(
     content::ServiceManagerConnection* connection) {
   DCHECK(connection);
 #if defined(USE_AURA)
-  if (shell::ShellIsRemote()) {
+  if (service_manager::ServiceManagerIsRemote()) {
     // TODO(rockot): Remove the blocking wait for init.
     // http://crbug.com/594852.
     base::RunLoop wait_loop;
     connection->SetInitializeHandler(wait_loop.QuitClosure());
     wait_loop.Run();
 
     input_device_client_.reset(new ui::InputDeviceClient());
     ui::mojom::InputDeviceServerPtr server;
     connection->GetConnector()->ConnectToInterface("service:ui", &server);
     input_device_client_->Connect(std::move(server));
 
     window_manager_connection_ = views::WindowManagerConnection::Create(
         connection->GetConnector(), connection->GetIdentity(),
         content::BrowserThread::GetTaskRunnerForThread(
             content::BrowserThread::IO));
   }
 #endif  // defined(USE_AURA)
 }