mash: Remove ShelfDelegate; move functions to ShelfModel.

ash/test/test_shell_delegate.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/test/test_shell_delegate.h"
 
 #include <limits>
 
 #include "ash/default_accessibility_delegate.h"
 #include "ash/gpu_support_stub.h"
 #include "ash/palette_delegate.h"
 #include "ash/public/cpp/shell_window_ids.h"
 #include "ash/root_window_controller.h"
 #include "ash/session/session_state_delegate.h"
 #include "ash/shelf/wm_shelf.h"
 #include "ash/shell.h"
 #include "ash/shell_observer.h"
 #include "ash/system/tray/system_tray_notifier.h"
 #include "ash/test/test_keyboard_ui.h"
 #include "ash/test/test_session_state_delegate.h"
-#include "ash/test/test_shelf_delegate.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ash/test/test_wallpaper_delegate.h"
 #include "ash/wm/window_state.h"
 #include "ash/wm/window_util.h"
 #include "ash/wm_window.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/image/image.h"
 
@@ skipping 62 matching lines @@
 void TestShellDelegate::Exit() {
   num_exit_requests_++;
 }
 
 keyboard::KeyboardUI* TestShellDelegate::CreateKeyboardUI() {
   return new TestKeyboardUI;
 }
 
 void TestShellDelegate::OpenUrlFromArc(const GURL& url) {}
 
-ShelfDelegate* TestShellDelegate::CreateShelfDelegate(ShelfModel* model) {
+void TestShellDelegate::ShelfInit() {
   // Create a separate shelf initializer that mimics ChromeLauncherController.
-  shelf_initializer_ = base::MakeUnique<ShelfInitializer>();
-  return new TestShelfDelegate();
+  if (!shelf_initializer_)
+    shelf_initializer_ = base::MakeUnique<ShelfInitializer>();
 }
 
 SystemTrayDelegate* TestShellDelegate::CreateSystemTrayDelegate() {
   return new TestSystemTrayDelegate;
 }
 
 std::unique_ptr<WallpaperDelegate>
 TestShellDelegate::CreateWallpaperDelegate() {
   return base::MakeUnique<TestWallpaperDelegate>();
 }
@@ skipping 36 matching lines @@
 void TestShellDelegate::SetTouchscreenEnabledInPrefs(bool enabled,
                                                      bool use_local_state) {
   if (use_local_state)
     touchscreen_enabled_in_local_pref_ = enabled;
 }
 
 void TestShellDelegate::UpdateTouchscreenStatusFromPrefs() {}
 
 }  // namespace test
 }  // namespace ash