[SystemInfo API] Rewrite DisplayInfoProvider without SystemInfoProvider.

chrome/browser/extensions/api/system_display/display_info_provider_chromeos_unittest.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/display_info_provider.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/display_manager_test_api.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "ui/gfx/display.h"
 #include "ui/gfx/rect.h"
 
 namespace extensions {
 namespace {
 
-void BindRequestDisplayInfoResult(DisplayInfo* target, bool success) {
-  ASSERT_TRUE(success);
-  *target = DisplayInfoProvider::Get()->display_info();
-}
-
-void BindSetDisplayUnitInfoResult(bool* success,
-                                  std::string* error,
-                                  bool success_in,
-                                  const std::string& error_in) {
-  *success = success_in;
-  *error = error_in;
-}
-
 class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
  public:
   DisplayInfoProviderChromeosTest() {}
 
   virtual ~DisplayInfoProviderChromeosTest() {}
 
  protected:
-  void CallRequestDisplayInfo(DisplayInfo* result) {
-    DisplayInfoProvider::Get()->RequestInfo(
-        base::Bind(&BindRequestDisplayInfoResult, result));
-    RunAllPendingInMessageLoop();
-  }
-
   void CallSetDisplayUnitInfo(
       const std::string& display_id,
       const api::system_display::DisplayProperties& info,
       bool* success,
       std::string* error) {
-    DisplayInfoProvider::Get()->SetInfo(display_id, info,
-        base::Bind(&BindSetDisplayUnitInfoResult, success, error));
-    RunAllPendingInMessageLoop();
+    // Reset error messsage.
+    (*error).clear();
+    *success = DisplayInfoProvider::Get()->SetInfo(display_id, info, error);
   }
 
   bool DisplayExists(int64 display_id) const {
     const gfx::Display& display =
         GetDisplayManager()->GetDisplayForId(display_id);
     return display.id() != gfx::Display::kInvalidDisplayID;
   }
 
   ash::internal::DisplayManager* GetDisplayManager() const {
     return ash::Shell::GetInstance()->display_manager();
@@ skipping 15 matching lines @@
     // Order to match gfx::Rect::ToString().
     return base::StringPrintf("%d,%d %dx%d",
         bounds.left,  bounds.top, bounds.width, bounds.height);
   }
 
   DISALLOW_COPY_AND_ASSIGN(DisplayInfoProviderChromeosTest);
 };
 
 TEST_F(DisplayInfoProviderChromeosTest, GetBasic) {
   UpdateDisplay("500x600,400x520");
-  DisplayInfo result;
-  CallRequestDisplayInfo(&result);
+  DisplayInfo result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
 
   int64 display_id;
   ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id))
       << "Display id must be convertable to integer: " << result[0]->id;
 
   ASSERT_TRUE(DisplayExists(display_id)) << display_id << " not found";
   EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ("0,0,0,0", SystemInfoDisplayInsetsToString(result[0]->overscan));
@@ skipping 18 matching lines @@
   EXPECT_EQ(0, result[1]->rotation);
   EXPECT_FALSE(result[1]->is_primary);
   EXPECT_EQ(96, result[1]->dpi_x);
   EXPECT_EQ(96, result[1]->dpi_y);
   EXPECT_TRUE(result[1]->mirroring_source_id.empty());
   EXPECT_TRUE(result[1]->is_enabled);
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, GetRotation) {
   UpdateDisplay("500x600/r");
-  DisplayInfo result;
-  CallRequestDisplayInfo(&result);
+  DisplayInfo result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(1u, result.size());
 
   int64 display_id;
   ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id))
       << "Display id must be convertable to integer: " << result[0]->id;
 
   ASSERT_TRUE(DisplayExists(display_id)) << display_id << " not found";
   EXPECT_EQ("0,0 600x500", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ(90, result[0]->rotation);
 
   GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_270);
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(1u, result.size());
 
   EXPECT_EQ(base::Int64ToString(display_id), result[0]->id);
   EXPECT_EQ("0,0 600x500", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ(270, result[0]->rotation);
 
   GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_180);
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(1u, result.size());
 
   EXPECT_EQ(base::Int64ToString(display_id), result[0]->id);
   EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ(180, result[0]->rotation);
 
   GetDisplayManager()->SetDisplayRotation(display_id, gfx::Display::ROTATE_0);
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(1u, result.size());
 
   EXPECT_EQ(base::Int64ToString(display_id), result[0]->id);
   EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ(0, result[0]->rotation);
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, GetHiDPI) {
   UpdateDisplay("500x600,400x520*2");
   DisplayInfo result;
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
 
   EXPECT_EQ("0,0 500x600", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ(96, result[0]->dpi_x);
   EXPECT_EQ(96, result[0]->dpi_y);
 
   EXPECT_EQ("500,0 200x260",
             SystemInfoDisplayBoundsToString(result[1]->bounds));
   EXPECT_EQ(2 * 96, result[1]->dpi_x);
   EXPECT_EQ(2 * 96, result[1]->dpi_y);
 
   GetDisplayController()->SwapPrimaryDisplay();
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
 
   EXPECT_EQ("-500,0 500x600",
             SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ(96, result[0]->dpi_x);
   EXPECT_EQ(96, result[0]->dpi_y);
 
   EXPECT_EQ("0,0 200x260", SystemInfoDisplayBoundsToString(result[1]->bounds));
   EXPECT_EQ(2 * 96, result[1]->dpi_x);
   EXPECT_EQ(2 * 96, result[1]->dpi_y);
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, GetVisibleArea) {
   UpdateDisplay("640x720*2/o, 400x520/o");
   DisplayInfo result;
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
 
   int64 display_id;
   ASSERT_TRUE(base::StringToInt64(result[1]->id, &display_id))
       << "Display id must be convertable to integer: " << result[1]->id;
   ASSERT_TRUE(DisplayExists(display_id)) << display_id << " not found";
 
   // Default overscan is 5%.
   EXPECT_EQ("304,0 380x494",
             SystemInfoDisplayBoundsToString(result[1]->bounds));
   EXPECT_EQ("13,10,13,10",
             SystemInfoDisplayInsetsToString(result[1]->overscan));
 
   GetDisplayManager()->SetOverscanInsets(display_id,
                                          gfx::Insets(20, 30, 50, 60));
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
 
   EXPECT_EQ(base::Int64ToString(display_id), result[1]->id);
   EXPECT_EQ("304,0 310x450",
             SystemInfoDisplayBoundsToString(result[1]->bounds));
   EXPECT_EQ("20,30,50,60",
             SystemInfoDisplayInsetsToString(result[1]->overscan));
 
   // Set insets for the primary screen. Note that it has 2x scale.
   ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id))
       << "Display id must be convertable to integer: " << result[0]->id;
   ASSERT_TRUE(DisplayExists(display_id)) << display_id << " not found";
 
   EXPECT_EQ("0,0 304x342", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ("9,8,9,8", SystemInfoDisplayInsetsToString(result[0]->overscan));
 
   GetDisplayManager()->SetOverscanInsets(display_id,
                                          gfx::Insets(10, 20, 30, 40));
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
 
   EXPECT_EQ(base::Int64ToString(display_id), result[0]->id);
   EXPECT_EQ("0,0 260x320", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ("10,20,30,40",
             SystemInfoDisplayInsetsToString(result[0]->overscan));
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, GetMirroring) {
   UpdateDisplay("600x600, 400x520/o");
   DisplayInfo result;
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
 
   int64 display_id_primary;
   ASSERT_TRUE(base::StringToInt64(result[0]->id, &display_id_primary))
       << "Display id must be convertable to integer: " << result[0]->id;
   ASSERT_TRUE(DisplayExists(display_id_primary))
       << display_id_primary << " not found";
 
   int64 display_id_secondary;
   ASSERT_TRUE(base::StringToInt64(result[1]->id, &display_id_secondary))
       << "Display id must be convertable to integer: " << result[1]->id;
   ASSERT_TRUE(DisplayExists(display_id_secondary))
       << display_id_secondary << " not found";
 
   ASSERT_FALSE(GetDisplayManager()->IsMirrored());
   EXPECT_TRUE(result[0]->mirroring_source_id.empty());
   EXPECT_TRUE(result[1]->mirroring_source_id.empty());
 
   GetDisplayManager()->SetMirrorMode(true);
   ASSERT_TRUE(GetDisplayManager()->IsMirrored());
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(1u, result.size());
   EXPECT_EQ(base::Int64ToString(display_id_primary), result[0]->id);
   EXPECT_EQ(base::Int64ToString(display_id_secondary),
             result[0]->mirroring_source_id);
 
   GetDisplayManager()->SetMirrorMode(false);
   ASSERT_FALSE(GetDisplayManager()->IsMirrored());
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
 
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ(base::Int64ToString(display_id_primary), result[0]->id);
   EXPECT_TRUE(result[0]->mirroring_source_id.empty());
   EXPECT_EQ(base::Int64ToString(display_id_secondary), result[1]->id);
   EXPECT_TRUE(result[1]->mirroring_source_id.empty());
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, GetBounds) {
   UpdateDisplay("600x600, 400x520");
   GetDisplayController()->SetLayoutForCurrentDisplays(
       ash::DisplayLayout::FromInts(ash::DisplayLayout::LEFT, -40));
 
-  DisplayInfo result;
-  CallRequestDisplayInfo(&result);
+  DisplayInfo result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
+
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ("0,0 600x600", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ("-400,-40 400x520",
             SystemInfoDisplayBoundsToString(result[1]->bounds));
 
   GetDisplayController()->SetLayoutForCurrentDisplays(
       ash::DisplayLayout::FromInts(ash::DisplayLayout::TOP, 40));
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
+
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ("0,0 600x600", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ("40,-520 400x520",
             SystemInfoDisplayBoundsToString(result[1]->bounds));
 
   GetDisplayController()->SetLayoutForCurrentDisplays(
       ash::DisplayLayout::FromInts(ash::DisplayLayout::BOTTOM, 80));
 
-  CallRequestDisplayInfo(&result);
+  result = DisplayInfoProvider::Get()->GetAllDisplaysInfo();
   ASSERT_EQ(2u, result.size());
   EXPECT_EQ("0,0 600x600", SystemInfoDisplayBoundsToString(result[0]->bounds));
   EXPECT_EQ("80,600 400x520",
             SystemInfoDisplayBoundsToString(result[1]->bounds));
 }
 
 TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftExact) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
@@ skipping 568 matching lines @@
   CallSetDisplayUnitInfo(base::Int64ToString(internal_display_id), info,
       &success, &error);
 
   ASSERT_FALSE(success);
   EXPECT_EQ("Overscan changes not allowed for the internal monitor.",
             error);
 }
 
 }  // namespace
 }  // namespace extensions