Update To 11.40.268.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 c5a87ca..c0418f4 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
@@ -42,13 +42,13 @@ class MockScreen : public ash::ScreenAsh {
 
  protected:
   // Overridden from gfx::Screen:
-  virtual int GetNumDisplays() const OVERRIDE {
+  virtual int GetNumDisplays() const override {
     return displays_.size();
   }
-  virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
+  virtual std::vector<gfx::Display> GetAllDisplays() const override {
     return displays_;
   }
-  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
+  virtual gfx::Display GetPrimaryDisplay() const override {
     return displays_[0];
   }
 
@@ -69,42 +69,33 @@ class MockScreen : public Screen {
       displays_.push_back(display);
     }
   }
-  virtual ~MockScreen() {}
+  ~MockScreen() override {}
 
  protected:
   // Overridden from gfx::Screen:
-  virtual bool IsDIPEnabled() OVERRIDE { return true; }
-  virtual gfx::Point GetCursorScreenPoint() OVERRIDE  { return gfx::Point(); }
-  virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE {
+  gfx::Point GetCursorScreenPoint() override { return gfx::Point(); }
+  gfx::NativeWindow GetWindowUnderCursor() override {
     return gfx::NativeWindow();
   }
-  virtual gfx::NativeWindow GetWindowAtScreenPoint(
-      const gfx::Point& point) OVERRIDE {
+  gfx::NativeWindow GetWindowAtScreenPoint(const gfx::Point& point) override {
     return gfx::NativeWindow();
   }
-  virtual int GetNumDisplays() const OVERRIDE {
-    return displays_.size();
-  }
-  virtual std::vector<gfx::Display> GetAllDisplays() const OVERRIDE {
+  int GetNumDisplays() const override { return displays_.size(); }
+  std::vector<gfx::Display> GetAllDisplays() const override {
     return displays_;
   }
-  virtual gfx::Display GetDisplayNearestWindow(
-      gfx::NativeView window) const OVERRIDE {
+  gfx::Display GetDisplayNearestWindow(gfx::NativeView window) const override {
     return gfx::Display(0);
   }
-  virtual gfx::Display GetDisplayNearestPoint(
-      const gfx::Point& point) const OVERRIDE {
+  gfx::Display GetDisplayNearestPoint(const gfx::Point& point) const override {
     return gfx::Display(0);
   }
-  virtual gfx::Display GetDisplayMatching(
-      const gfx::Rect& match_rect) const OVERRIDE {
+  gfx::Display GetDisplayMatching(const gfx::Rect& match_rect) const override {
     return gfx::Display(0);
   }
-  virtual gfx::Display GetPrimaryDisplay() const OVERRIDE {
-    return displays_[0];
-  }
-  virtual void AddObserver(gfx::DisplayObserver* observer) OVERRIDE {}
-  virtual void RemoveObserver(gfx::DisplayObserver* observer) OVERRIDE {}
+  gfx::Display GetPrimaryDisplay() const override { return displays_[0]; }
+  void AddObserver(gfx::DisplayObserver* observer) override {}
+  void RemoveObserver(gfx::DisplayObserver* observer) override {}
 
  private:
   std::vector<gfx::Display> displays_;
@@ -117,12 +108,11 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
  public:
   MockDisplayInfoProvider() {}
 
-  virtual ~MockDisplayInfoProvider() {}
+  ~MockDisplayInfoProvider() override {}
 
-  virtual bool SetInfo(
-      const std::string& display_id,
-      const core_api::system_display::DisplayProperties& params,
-      std::string* error) OVERRIDE {
+  bool SetInfo(const std::string& display_id,
+               const core_api::system_display::DisplayProperties& params,
+               std::string* error) override {
     // Should get called only once per test case.
     EXPECT_FALSE(set_info_value_);
     set_info_value_ = params.ToValue();
@@ -130,7 +120,7 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
     return true;
   }
 
-  virtual gfx::Screen* GetActiveScreen() OVERRIDE { return NULL; }
+  gfx::Screen* GetActiveScreen() override { return NULL; }
 
   scoped_ptr<base::DictionaryValue> GetSetInfoValue() {
     return set_info_value_.Pass();
@@ -143,9 +133,9 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
  private:
   // Update the content of the |unit| obtained for |display| using
   // platform specific method.
-  virtual void UpdateDisplayUnitInfoForPlatform(
+  void UpdateDisplayUnitInfoForPlatform(
       const gfx::Display& display,
-      extensions::core_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,9 +165,9 @@ class SystemDisplayApiTest: public ExtensionApiTest {
   SystemDisplayApiTest() : provider_(new MockDisplayInfoProvider),
                            screen_(new MockScreen) {}
 
-  virtual ~SystemDisplayApiTest() {}
+  ~SystemDisplayApiTest() override {}
 
-  virtual void SetUpOnMainThread() OVERRIDE {
+  void SetUpOnMainThread() override {
     ExtensionApiTest::SetUpOnMainThread();
     ANNOTATE_LEAKING_OBJECT_PTR(
         gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE));
@@ -185,7 +175,7 @@ class SystemDisplayApiTest: public ExtensionApiTest {
     DisplayInfoProvider::InitializeForTesting(provider_.get());
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  void TearDownOnMainThread() override {
 #if defined(OS_CHROMEOS)
     gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE,
                                    ash::Shell::GetScreen());