[SystemInfo API] Rewrite DisplayInfoProvider without SystemInfoProvider.

chrome/browser/extensions/api/system_display/system_display_apitest.cc

Index: chrome/browser/extensions/api/system_display/system_display_apitest.cc
diff --git a/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc
index 7880c4647d5d2c6eb906c8c14c88804bc54a00dd..1fbc26f995f98b24df44c2a352890817ef1b034b 100644
--- a/chrome/browser/extensions/api/system_display/system_display_apitest.cc
+++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc
@@ -8,6 +8,9 @@
 #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"
 
 namespace utils = extension_function_test_utils;
 
@@ -15,53 +18,78 @@ namespace extensions {
 
 using api::system_display::Bounds;
 using api::system_display::DisplayUnitInfo;
+using gfx::Screen;
 
-class MockDisplayInfoProvider : public DisplayInfoProvider {
+class MockScreen : public Screen {
  public:
-  MockDisplayInfoProvider() {}
-
-  virtual bool QueryInfo() OVERRIDE {
-    info_.clear();
+  MockScreen() {
     for (int i = 0; i < 4; i++) {
-      linked_ptr<DisplayUnitInfo> unit(new DisplayUnitInfo());
-      unit->id = base::IntToString(i);
-      unit->name = "DISPLAY NAME FOR " + unit->id;
-      if (i == 1)
-        unit->mirroring_source_id = "0";
-      unit->is_primary = i == 0 ? true : false;
-      unit->is_internal = i == 0 ? true : false;
-      unit->is_enabled = true;
-      unit->rotation = (90 * i) % 360;
-      unit->dpi_x = 96.0;
-      unit->dpi_y = 96.0;
-      unit->bounds.left = 0;
-      unit->bounds.top = 0;
-      unit->bounds.width = 1280;
-      unit->bounds.height = 720;
-      if (i == 0) {
-        unit->overscan.left = 20;
-        unit->overscan.top = 40;
-        unit->overscan.right = 60;
-        unit->overscan.bottom = 80;
-      }
-      unit->work_area.left = 0;
-      unit->work_area.top = 0;
-      unit->work_area.width = 960;
-      unit->work_area.height = 720;
-      info_.push_back(unit);
+      gfx::Rect bounds(0, 0, 1280, 720);
+      gfx::Rect work_area(0, 0, 960, 720);
+      gfx::Display display(i, bounds);
+      display.set_work_area(work_area);
+      displays_.push_back(display);
     }
-    return true;
   }
+  virtual ~MockScreen() {}
+
+ protected:
+  // Overridden from gfx::Screen:
+  virtual bool IsDIPEnabled() OVERRIDE { return true; }
+  virtual gfx::Point GetCursorScreenPoint() OVERRIDE  { return gfx::Point(); }
+  virtual gfx::NativeWindow GetWindowUnderCursor() OVERRIDE {
+    return gfx::NativeWindow();
+  }
+  virtual 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 {
+    return displays_;
+  }
+  virtual gfx::Display GetDisplayNearestWindow(
+      gfx::NativeView window) const OVERRIDE {
+    return gfx::Display(0);
+  }
+  virtual gfx::Display GetDisplayNearestPoint(
+      const gfx::Point& point) const OVERRIDE {
+    return gfx::Display(0);
+  }
+  virtual 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 {}
+
+ private:
+  std::vector<gfx::Display> displays_;
+
+  DISALLOW_COPY_AND_ASSIGN(MockScreen);
+};
+
+
+class MockDisplayInfoProvider : public DisplayInfoProvider {
+ public:
+  MockDisplayInfoProvider() {}
 
-  virtual void SetInfo(
+  virtual ~MockDisplayInfoProvider() {}
+
+  virtual bool SetInfo(
       const std::string& display_id,
       const api::system_display::DisplayProperties& params,
-      const SetInfoCallback& callback) OVERRIDE {
+      std::string* error) OVERRIDE {
     // Should get called only once per test case.
     EXPECT_FALSE(set_info_value_);
     set_info_value_ = params.ToValue();
     set_info_display_id_ = display_id;
-    callback.Run(true, std::string());
+    return true;
   }
 
   scoped_ptr<base::DictionaryValue> GetSetInfoValue() {
@@ -73,7 +101,28 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
   }
 
  private:
-  virtual ~MockDisplayInfoProvider() {}
+  // Update the content of the |unit| obtained for |display| using
+  // platform specific method.
+  virtual void UpdateDisplayUnitInfoForPlatform(
+      const gfx::Display& display,
+      extensions::api::system_display::DisplayUnitInfo* unit) OVERRIDE {
+    int64 id = display.id();
+    unit->name = "DISPLAY NAME FOR " + base::Int64ToString(id);
+    if (id == 1)
+      unit->mirroring_source_id = "0";
+    unit->is_primary = id == 0 ? true : false;
+    unit->is_internal = id == 0 ? true : false;
+    unit->is_enabled = true;
+    unit->rotation = (90 * id) % 360;
+    unit->dpi_x = 96.0;
+    unit->dpi_y = 96.0;
+    if (id == 0) {
+      unit->overscan.left = 20;
+      unit->overscan.top = 40;
+      unit->overscan.right = 60;
+      unit->overscan.bottom = 80;
+    }
+  }
 
   scoped_ptr<base::DictionaryValue> set_info_value_;
   std::string set_info_display_id_;
@@ -83,24 +132,24 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
 
 class SystemDisplayApiTest: public ExtensionApiTest {
  public:
-  SystemDisplayApiTest() {}
+  SystemDisplayApiTest() : provider_(new MockDisplayInfoProvider),
+                           screen_(new MockScreen) {}
+
   virtual ~SystemDisplayApiTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
-    provider_ = new MockDisplayInfoProvider();
-    // The |provider| will be co-owned by the singleton instance.
-    DisplayInfoProvider::InitializeForTesting(provider_);
+    gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get());

[Haojian Wu, 2013/09/18 13:03:55]

oshima@, Is this reset-screen usage available?

I test on my local machine(linux build with flag: aura and chromeos). The
browsertest will crash, the following are output log(run
SystemDisplayApiTest.GetDisplay test):

0x7f2e8e40ceb0] base::debug::StackTrace::StackTrace()
 [0x7f2e8e40c7b7] base::debug::(anonymous namespace)::StackDumpSignalHandler()
 [0x7f2e8125fcb0] <unknown>
 [0x00000244f8d4] std::vector<>::begin()
 [0x7f2e867d2497] aura::Window::GetChildById()
 [0x7f2e867d2468] aura::Window::GetChildById()
 [0x7f2e8cd68d48] ash::Shell::GetContainer()
 [0x7f2e8ce46525] ash::(anonymous namespace)::GetContainerById()
 [0x7f2e8ce467ff] ash::StackingController::GetDefaultParent()
 [0x7f2e867d1a9e] aura::Window::SetDefaultParentByRootWindow()
 [0x7f2e86ad02de] views::internal::NativeWidgetPrivate::ReparentNativeView()
 [0x7f2e86ad2f2d] views::Widget::ReparentNativeView()
 [0x7f2e86a3940e] views::NativeViewHostAura::NativeViewDetaching()
 [0x7f2e86a389b3] views::NativeViewHost::Detach()
 [0x7f2e86a3832f] views::NativeViewHost::Detach()
 [0x7f2e90f2137b] views::WebView::DetachWebContents()
 [0x7f2e90f20a79] views::WebView::SetWebContents()
 [0x0000029f7b6f] BrowserView::TabDetachedAt()
 [0x000002988c27] TabStripModel::DetachWebContentsAt()
 [0x00000298c52a] TabStripModel::Observe()
 [0x7f2e83e159f8] content::NotificationServiceImpl::Notify()
 [0x7f2e83ffd43e] content::WebContentsImpl::~WebContentsImpl()
 [0x7f2e83ffd768] content::WebContentsImpl::~WebContentsImpl()
 [0x00000298cec6] TabStripModel::InternalCloseTab()
 [0x00000298cd9a] TabStripModel::InternalCloseTabs()
 [0x00000298967e] TabStripModel::CloseAllTabs()
 [0x0000029121e2] Browser::OnWindowClosing()
 [0x0000029f8b8d] BrowserView::CanClose()
 [0x7f2e86ae3de5] views::NonClientView::CanClose()
 [0x7f2e86ad3d05] views::Widget::Close()
 [0x0000029f5c19] BrowserView::Close()
 [0x0000015d3424] BrowserCloseManager::CloseBrowsers()
 [0x0000015d2eb5] BrowserCloseManager::StartClosingBrowsers()
 [0x0000015d2124] chrome::CloseAllBrowsers()
 [0x000001e08ca7] BrowserProcessPlatformPartBase::AttemptExit()
 [0x0000015d2040] chrome::AttemptExitInternal()
 [0x0000015d26b3] chrome::AttemptExit()
 [0x000000922f87] base::internal::RunnableAdapter<>::Run()
 [0x00000092253d] base::internal::InvokeHelper<>::MakeItSo()
 [0x00000092183b] base::internal::Invoker<>::Run()
 [0x7f2e8e3fff49] base::Callback<>::Run()
 [0x7f2e8e4624dc] base::MessageLoop::RunTask()
 [0x7f2e8e462600] base::MessageLoop::DeferOrRunPendingTask()
 [0x7f2e8e462b25] base::MessageLoop::DoWork()
 [0x7f2e8e3e1f75] base::MessagePumpGlib::HandleDispatch()
 [0x7f2e8e3e1757] base::(anonymous namespace)::WorkSourceDispatch()
 [0x7f2e7f0e4d53] g_main_context_dispatch
 [0x7f2e7f0e50a0] <unknown>
 [0x7f2e7f0e5164] g_main_context_iteration
 [0x7f2e8e3e1b82] base::MessagePumpGlib::RunWithDispatcher()
 [0x7f2e8e3e1ffe] base::MessagePumpGlib::Run()
 [0x7f2e8e462069] base::MessageLoop::RunInternal()
 [0x7f2e8e461f20] base::MessageLoop::RunHandler()
 [0x7f2e8e4a338c] base::RunLoop::Run()
 [0x000001e7ecad] content::RunThisRunLoop()
 [0x000001e7ec3a] content::RunMessageLoop()
 [0x0000024396a7] InProcessBrowserTest::QuitBrowsers()
 [0x000002439540] InProcessBrowserTest::RunTestOnMainThreadLoop()
 [0x000003665037] content::BrowserTestBase::ProxyRunTestOnMainThreadLoop()
 [0x00000366590a] base::internal::RunnableAdapter<>::Run()
 [0x000003665855] base::internal::InvokeHelper<>::MakeItSo()
 [0x00000366577b] base::internal::Invoker<>::Run()
  r8: 0000000000000030  r9: 0101010101010101 r10: 0000000000000000 r11:
00007f2e7fa69d36
 r12: 0000000000000001 r13: 0000000000000001 r14: 0000000000000000 r15:
0000388d5ccf1890
  di: 00000000000000e8  si: 0000000000000003  bp: 00007ffffa3bb020  bx:
0000000000000000
  dx: 0000000000000003  ax: 00000000000000e8  cx: 0000000000000001  sp:
00007ffffa3bb000
  ip: 000000000244f8d4 efl: 0000000000010206 cgf: 0000000000000033 erf:
0000000000000004
 trp: 000000000000000e msk: 0000000000000000 cr2: 00000000000000e8
[0918/053445:ERROR:kill_posix.cc(190)] Unable to terminate process group 12188:
No such process
[1/1] SystemDisplayApiTest.GetDisplay (12131 ms)

I can confirm the crash made by this statement(If we remove this statement, the
crash will disappear.). Since I'm not familar with chromeos ui code. Could you
please help to take a look this?

Thanks.

+    DisplayInfoProvider::InitializeForTesting(provider_.get());
   }
 
   virtual void CleanUpOnMainThread() OVERRIDE {
-    // Has to be released before the main thread is gone.
-    provider_ = NULL;
     ExtensionApiTest::CleanUpOnMainThread();
   }
 
  protected:
-  scoped_refptr<MockDisplayInfoProvider> provider_;
+  scoped_ptr<MockDisplayInfoProvider> provider_;
+  scoped_ptr<gfx::Screen> screen_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemDisplayApiTest);
 };