Move yet more from WmShell to Shell

ash/shell/content/client/shell_browser_main_parts.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 "ash/shell/content/client/shell_browser_main_parts.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/wm_shell.h"
 #include "ash/content/shell_content_state.h"
 #include "ash/shell.h"
@@ skipping 119 matching lines @@
   init_params.delegate = delegate_;
   init_params.context_factory = content::GetContextFactory();
   init_params.context_factory_private = content::GetContextFactoryPrivate();
   init_params.blocking_pool = content::BrowserThread::GetBlockingPool();
   ash::Shell::CreateInstance(init_params);
 
   // Initialize session controller client and create fake sessions before
   // creating shelf.
   example_session_controller_client_ =
       base::MakeUnique<ExampleSessionControllerClient>(
-          WmShell::Get()->session_controller());
+          Shell::Get()->session_controller());
   example_session_controller_client_->Initialize();
 
-  ash::WmShell::Get()->CreateShelfView();
-  ash::WmShell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
+  ash::Shell::Get()->CreateShelfView();
+  ash::Shell::Get()->UpdateAfterLoginStatusChange(LoginStatus::USER);
 
   window_watcher_.reset(new ash::shell::WindowWatcher);
   display::Screen::GetScreen()->AddObserver(window_watcher_.get());
 
   ash::shell::InitWindowTypeLauncher();
 
   // Initialize the example app list presenter.
   example_app_list_presenter_ = base::MakeUnique<ExampleAppListPresenter>();
   Shell::Get()->app_list()->SetAppListPresenter(
       example_app_list_presenter_->CreateInterfacePtrAndBind());
@@ skipping 23 matching lines @@
   browser_context_.reset();
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code) {
   base::RunLoop().Run();
   return true;
 }
 
 }  // namespace shell
 }  // namespace ash