Revert of Add OnDisplayMetricsChanged in DisplayObserver.

ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc

 // Copyright (c) 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 "ui/views/widget/desktop_aura/desktop_screen_x11.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 158 matching lines @@
           new views::DesktopNativeWidgetAura(toplevel);
     }
     toplevel_params.bounds = bounds;
     toplevel_params.remove_standard_frame = true;
     toplevel->Init(toplevel_params);
     return toplevel;
   }
 
  private:
   // Overridden from gfx::DisplayObserver:
+  virtual void OnDisplayBoundsChanged(const gfx::Display& display) OVERRIDE {
+    changed_display_.push_back(display);
+  }
+
   virtual void OnDisplayAdded(const gfx::Display& new_display) OVERRIDE {
     added_display_.push_back(new_display);
   }
 
   virtual void OnDisplayRemoved(const gfx::Display& old_display) OVERRIDE {
     removed_display_.push_back(old_display);
   }
 
-  virtual void OnDisplayMetricsChanged(const gfx::Display& display,
-                                       uint32_t metrics) OVERRIDE {
-    changed_display_.push_back(display);
-  }
-
   scoped_ptr<DesktopScreenX11> screen_;
 
   DISALLOW_COPY_AND_ASSIGN(DesktopScreenX11Test);
 };
 
 TEST_F(DesktopScreenX11Test, BoundsChangeSingleMonitor) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 1024, 768)));
   screen()->ProcessDisplayChange(displays);
 
   EXPECT_EQ(1u, changed_display_.size());
   EXPECT_EQ(0u, added_display_.size());
   EXPECT_EQ(0u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, AddMonitorToTheRight) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
   screen()->ProcessDisplayChange(displays);
 
-  EXPECT_EQ(1u, changed_display_.size());
+  EXPECT_EQ(0u, changed_display_.size());
   EXPECT_EQ(1u, added_display_.size());
   EXPECT_EQ(0u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, AddMonitorToTheLeft) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kSecondDisplay, gfx::Rect(0, 0, 1024, 768)));
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(1024, 0, 640, 480)));
   screen()->ProcessDisplayChange(displays);
 
   EXPECT_EQ(1u, changed_display_.size());
   EXPECT_EQ(1u, added_display_.size());
   EXPECT_EQ(0u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, RemoveMonitorOnRight) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
   screen()->ProcessDisplayChange(displays);
 
   ResetDisplayChanges();
 
   displays.clear();
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   screen()->ProcessDisplayChange(displays);
 
-  EXPECT_EQ(1u, changed_display_.size());
+  EXPECT_EQ(0u, changed_display_.size());
   EXPECT_EQ(0u, added_display_.size());
   EXPECT_EQ(1u, removed_display_.size());
 }
 
 TEST_F(DesktopScreenX11Test, RemoveMonitorOnLeft) {
   std::vector<gfx::Display> displays;
   displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
   displays.push_back(gfx::Display(kSecondDisplay,
                                   gfx::Rect(640, 0, 1024, 768)));
   screen()->ProcessDisplayChange(displays);
@@ skipping 195 matching lines @@
   generator.PressRightButton();
   generator.ReleaseRightButton();
   EXPECT_FALSE(rwh->IsMaximized());
   generator.DoubleClickLeftButton();
   RunPendingMessages();
   EXPECT_FALSE(rwh->IsMaximized());
 
   widget->CloseNow();
 }
 
-// Test that rotating the displays notifies the DisplayObservers.
-TEST_F(DesktopScreenX11Test, RotationChange) {
-  std::vector<gfx::Display> displays;
-  displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
-  displays.push_back(
-      gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
-  ResetDisplayChanges();
-
-  displays[0].set_rotation(gfx::Display::ROTATE_90);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(1u, changed_display_.size());
-
-  displays[1].set_rotation(gfx::Display::ROTATE_90);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(2u, changed_display_.size());
-
-  displays[0].set_rotation(gfx::Display::ROTATE_270);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(3u, changed_display_.size());
-
-  displays[0].set_rotation(gfx::Display::ROTATE_270);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(3u, changed_display_.size());
-
-  displays[0].set_rotation(gfx::Display::ROTATE_0);
-  displays[1].set_rotation(gfx::Display::ROTATE_0);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(5u, changed_display_.size());
-}
-
-// Test that changing the displays workarea notifies the DisplayObservers.
-TEST_F(DesktopScreenX11Test, WorkareaChange) {
-  std::vector<gfx::Display> displays;
-  displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
-  displays.push_back(
-      gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
-  ResetDisplayChanges();
-
-  displays[0].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(1u, changed_display_.size());
-
-  displays[1].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(2u, changed_display_.size());
-
-  displays[0].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(2u, changed_display_.size());
-
-  displays[1].set_work_area(gfx::Rect(0, 0, 300, 300));
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(2u, changed_display_.size());
-
-  displays[0].set_work_area(gfx::Rect(0, 0, 640, 480));
-  displays[1].set_work_area(gfx::Rect(640, 0, 1024, 768));
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(4u, changed_display_.size());
-}
-
-// Test that changing the device scale factor notifies the DisplayObservers.
-TEST_F(DesktopScreenX11Test, DeviceScaleFactorChange) {
-  std::vector<gfx::Display> displays;
-  displays.push_back(gfx::Display(kFirstDisplay, gfx::Rect(0, 0, 640, 480)));
-  displays.push_back(
-      gfx::Display(kSecondDisplay, gfx::Rect(640, 0, 1024, 768)));
-  screen()->ProcessDisplayChange(displays);
-  ResetDisplayChanges();
-
-  displays[0].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(1u, changed_display_.size());
-
-  displays[1].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(2u, changed_display_.size());
-
-  displays[0].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(2u, changed_display_.size());
-
-  displays[1].set_device_scale_factor(2.5f);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(2u, changed_display_.size());
-
-  displays[0].set_device_scale_factor(1.f);
-  displays[1].set_device_scale_factor(1.f);
-  screen()->ProcessDisplayChange(displays);
-  EXPECT_EQ(4u, changed_display_.size());
-}
-
 }  // namespace views