Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / extensions / api / system_display / system_display_apitest.cc

diff --git a/src/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/src/chrome/browser/extensions/api/system_display/system_display_apitest.cc
index a12556d..c5a87ca 100644 (file)
--- a/src/chrome/browser/extensions/api/system_display/system_display_apitest.cc
+++ b/src/chrome/browser/extensions/api/system_display/system_display_apitest.cc
@@ -2,18 +2,19 @@
 // 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 "extensions/browser/api/system_display/display_info_provider.h"
+#include "extensions/browser/api/system_display/system_display_api.h"
+#include "extensions/common/api/system_display.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
 
@@ -21,8 +22,8 @@ namespace utils = extension_function_test_utils;
 
 namespace extensions {
 
-using api::system_display::Bounds;
-using api::system_display::DisplayUnitInfo;
+using core_api::system_display::Bounds;
+using core_api::system_display::DisplayUnitInfo;
 using gfx::Screen;
 
 #if defined(OS_CHROMEOS)
@@ -50,6 +51,7 @@ class MockScreen : public ash::ScreenAsh {
   virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
     return displays_[0];
   }
+
  private:
   std::vector<gfx::Display> displays_;
 
@@ -119,7 +121,7 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
 
   virtual bool SetInfo(
       const std::string& display_id,
-      const api::system_display::DisplayProperties& params,
+      const core_api::system_display::DisplayProperties& params,
       std::string* error) OVERRIDE {
     // Should get called only once per test case.
     EXPECT_FALSE(set_info_value_);
@@ -128,6 +130,8 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
     return true;
   }
 
+  virtual gfx::Screen* GetActiveScreen() OVERRIDE { return NULL; }
+
   scoped_ptr<base::DictionaryValue> GetSetInfoValue() {
     return set_info_value_.Pass();
   }
@@ -141,7 +145,7 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
   // platform specific method.
   virtual void UpdateDisplayUnitInfoForPlatform(
       const gfx::Display& display,
-      extensions::api::system_display::DisplayUnitInfo* unit) OVERRIDE {
+      extensions::core_api::system_display::DisplayUnitInfo* unit) OVERRIDE {
     int64 id = display.id();
     unit->name = "DISPLAY NAME FOR " + base::Int64ToString(id);
     if (id == 1)
@@ -175,22 +179,25 @@ class SystemDisplayApiTest: public ExtensionApiTest {
 
   virtual void SetUpOnMainThread() OVERRIDE {
     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 {
+  virtual void TearDownOnMainThread() OVERRIDE {
 #if defined(OS_CHROMEOS)
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
-                                   ash::Shell::GetInstance()->screen());
+                                   ash::Shell::GetScreen());
 #endif
-    ExtensionApiTest::CleanUpOnMainThread();
+    ExtensionApiTest::TearDownOnMainThread();
   }
 
  protected:
   scoped_ptr<MockDisplayInfoProvider> provider_;
   scoped_ptr<gfx::Screen> screen_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(SystemDisplayApiTest);
 };
 
@@ -298,4 +305,4 @@ IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplayKioskEnabled) {
 }
 #endif  // defined(OS_CHROMEOS)
 
-} // namespace extensions
+}  // namespace extensions