[Cleanup] Screen cleanup

chrome/browser/extensions/api/system_display/system_display_apitest.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 "chrome/browser/extensions/api/system_display/system_display_api.h"
 
 #include "base/debug/leak_annotations.h"
 #include "base/strings/string_number_conversions.h"
 #include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/screen.h"
 
 #if defined(OS_CHROMEOS)
-#include "ash/screen_ash.h"
+#include "ash/display/screen_ash.h"
 #include "ash/shell.h"
 #endif
 
 namespace utils = extension_function_test_utils;
 
 namespace extensions {
 
 using api::system_display::Bounds;
 using api::system_display::DisplayUnitInfo;
 using gfx::Screen;
@@ skipping 150 matching lines @@
     ExtensionApiTest::SetUpOnMainThread();
     ANNOTATE_LEAKING_OBJECT_PTR(
         gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE));
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());
     DisplayInfoProvider::InitializeForTesting(provider_.get());
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
 #if defined(OS_CHROMEOS)
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
-                                   ash::Shell::GetInstance()->screen());
+                                   ash::Shell::GetScreen());
 #endif
     ExtensionApiTest::CleanUpOnMainThread();
   }
 
  protected:
   scoped_ptr<MockDisplayInfoProvider> provider_;
   scoped_ptr<gfx::Screen> screen_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemDisplayApiTest);
 };
@@ skipping 96 matching lines @@
   EXPECT_EQ(1, utils::GetInteger(overscan, "left"));
   EXPECT_EQ(2, utils::GetInteger(overscan, "top"));
   EXPECT_EQ(3, utils::GetInteger(overscan, "right"));
   EXPECT_EQ(4, utils::GetInteger(overscan, "bottom"));
 
   EXPECT_EQ("display_id", provider_->GetSetInfoDisplayId());
 }
 #endif  // defined(OS_CHROMEOS)
 
 } // namespace extensions