Promotes more accessors from WmShell to Shell

ash/common/system/chromeos/screen_security/screen_tray_item_unittest.cc

 // Copyright 2013 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/common/system/chromeos/screen_security/screen_tray_item.h"
 
 #include "ash/common/system/chromeos/screen_security/screen_capture_tray_item.h"
 #include "ash/common/system/chromeos/screen_security/screen_share_tray_item.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/tray_item_view.h"
 #include "ash/common/test/ash_test.h"
-#include "ash/common/wm_shell.h"
+#include "ash/shell.h"
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/geometry/point.h"
 #include "ui/message_center/message_center.h"
 #include "ui/views/view.h"
 
 namespace ash {
@@ skipping 112 matching lines @@
   // The stop callback shouldn't be called because we stopped
   // through the notification system.
   stop_function.Run();
   EXPECT_FALSE(tray_item->is_started());
   EXPECT_EQ(0, test->stop_callback_hit_count());
 }
 
 TEST_F(ScreenCaptureTest, NotificationStartAndStop) {
   base::Closure start_function = base::Bind(
       &SystemTrayNotifier::NotifyScreenCaptureStart,
-      base::Unretained(WmShell::Get()->system_tray_notifier()),
+      base::Unretained(Shell::Get()->system_tray_notifier()),
       base::Bind(&ScreenTrayItemTest::StopCallback, base::Unretained(this)),
       base::UTF8ToUTF16(kTestScreenCaptureAppName));
 
   base::Closure stop_function =
       base::Bind(&SystemTrayNotifier::NotifyScreenCaptureStop,
-                 base::Unretained(WmShell::Get()->system_tray_notifier()));
+                 base::Unretained(Shell::Get()->system_tray_notifier()));
 
   TestNotificationStartAndStop(this, start_function, stop_function);
 }
 
 TEST_F(ScreenShareTest, NotificationStartAndStop) {
   base::Closure start_func = base::Bind(
       &SystemTrayNotifier::NotifyScreenShareStart,
-      base::Unretained(WmShell::Get()->system_tray_notifier()),
+      base::Unretained(Shell::Get()->system_tray_notifier()),
       base::Bind(&ScreenTrayItemTest::StopCallback, base::Unretained(this)),
       base::UTF8ToUTF16(kTestScreenShareHelperName));
 
   base::Closure stop_func =
       base::Bind(&SystemTrayNotifier::NotifyScreenShareStop,
-                 base::Unretained(WmShell::Get()->system_tray_notifier()));
+                 base::Unretained(Shell::Get()->system_tray_notifier()));
 
   TestNotificationStartAndStop(this, start_func, stop_func);
 }
 
 void TestNotificationView(ScreenTrayItemTest* test) {
   ScreenTrayItem* tray_item = test->tray_item();
 
   test->StartSession();
   message_center::MessageCenter* message_center =
       message_center::MessageCenter::Get();
@@ skipping 38 matching lines @@
 
 TEST_F(ScreenCaptureTest, SystemTrayInteraction) {
   TestSystemTrayInteraction(this);
 }
 
 TEST_F(ScreenShareTest, SystemTrayInteraction) {
   TestSystemTrayInteraction(this);
 }
 
 }  // namespace ash