[SystemInfo API] Rename systemInfo Display API.

systemInfo.display.getDisplayInfo -> system.display.getInfo
systemInfo.display.onDisplayChanged -> system.display.onDisplayChanged
systemInfo.display.setDisplayProperties -> system.display.setDisplayProperties

BUG=252994
TEST=update system.display API browser_tests and pass through

Review URL: https://chromiumcodereview.appspot.com/18925005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@212790 0039d316-1c4b-4281-b951-d872f2087c98

29 files changed, 178 insertions, 172 deletions

diff --git a/chrome/browser/extensions/activity_log/api_name_constants.h b/chrome/browser/extensions/activity_log/api_name_constants.h
index c8e62d9..0fe950d 100644
--- a/chrome/browser/extensions/activity_log/api_name_constants.h
+++ b/chrome/browser/extensions/activity_log/api_name_constants.h
@@ -193,7 +193,10 @@ const char* const kNames[] = {
     "tabs.getSelected", "tabs.sendRequest",
     "systemInfo.cpu.get", "systemInfo.memory.get",
     "runtime.onRestartRequired",
-    "system.cpu.getInfo"
+    "system.cpu.getInfo",
+    "system.display.getInfo",
+    "system.display.onDisplayChanged",
+    "system.display.setDisplayProperties"
 };
 
 }  // namespace activity_log_api_name_constants
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider.cc b/chrome/browser/extensions/api/system_display/display_info_provider.cc
index 9534ed3..c97435e9 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider.cc
+++ b/chrome/browser/extensions/api/system_display/display_info_provider.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_info_display/display_info_provider.h"
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 
 namespace extensions {
 
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider.h b/chrome/browser/extensions/api/system_display/display_info_provider.h
index 63a7077..037b5f1 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider.h
+++ b/chrome/browser/extensions/api/system_display/display_info_provider.h
@@ -1,19 +1,19 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-#ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_DISPLAY_DISPLAY_INFO_PROVIDER_H_
-#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_DISPLAY_DISPLAY_INFO_PROVIDER_H_
+#ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_H_
+#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_H_
 
 #include <string>
 
 #include "chrome/browser/extensions/api/system_info/system_info_provider.h"
-#include "chrome/common/extensions/api/system_info_display.h"
+#include "chrome/common/extensions/api/system_display.h"
 
 namespace extensions {
 
 typedef std::vector<linked_ptr<
-    api::system_info_display::DisplayUnitInfo> > DisplayInfo;
+    api::system_display::DisplayUnitInfo> > DisplayInfo;
 
 class DisplayInfoProvider : public SystemInfoProvider<DisplayInfo> {
  public:
@@ -39,7 +39,7 @@ class DisplayInfoProvider : public SystemInfoProvider<DisplayInfo> {
   // This functionality is exposed only on ChromeOS.
   virtual void SetInfo(
       const std::string& display_id,
-      const api::system_info_display::DisplayProperties& info,
+      const api::system_display::DisplayProperties& info,
       const SetInfoCallback& callback);
 
   const DisplayInfo& display_info() const;
@@ -59,4 +59,4 @@ class DisplayInfoProvider : public SystemInfoProvider<DisplayInfo> {
 
 }  // namespace extensions
 
-#endif  // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_DISPLAY_DISPLAY_INFO_PROVIDER_H_
+#endif  // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_DISPLAY_DISPLAY_INFO_PROVIDER_H_
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc b/chrome/browser/extensions/api/system_display/display_info_provider_chromeos.cc
index caf95d0..712bc528 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos.cc
+++ b/chrome/browser/extensions/api/system_display/display_info_provider_chromeos.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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_info_display/display_info_provider.h"
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
@@ -18,10 +18,10 @@ using ash::internal::DisplayManager;
 
 namespace extensions {
 
-using api::system_info_display::Bounds;
-using api::system_info_display::DisplayUnitInfo;
-using api::system_info_display::DisplayProperties;
-using api::system_info_display::Insets;
+using api::system_display::Bounds;
+using api::system_display::DisplayUnitInfo;
+using api::system_display::DisplayProperties;
+using api::system_display::Insets;
 
 namespace {
 
@@ -73,8 +73,8 @@ void AddInfoForDisplay(const gfx::Display& display,
                        DisplayManager* display_manager,
                        int64 primary_display_id,
                        DisplayInfo* list) {
-  linked_ptr<extensions::api::system_info_display::DisplayUnitInfo> unit(
-      new extensions::api::system_info_display::DisplayUnitInfo());
+  linked_ptr<extensions::api::system_display::DisplayUnitInfo> unit(
+      new extensions::api::system_display::DisplayUnitInfo());
   const gfx::Rect& bounds = display.bounds();
   const gfx::Rect& work_area = display.work_area();
   const float dpi = display.device_scale_factor() * kDpi96;
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos_unittest.cc b/chrome/browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc
index 7b09b17..5960313 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider_chromeos_unittest.cc
+++ b/chrome/browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc
@@ -2,7 +2,7 @@
 // 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_info_display/display_info_provider.h"
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
@@ -46,7 +46,7 @@ class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
 
   void CallSetDisplayUnitInfo(
       const std::string& display_id,
-      const api::system_info_display::DisplayProperties& info,
+      const api::system_display::DisplayProperties& info,
       bool* success,
       std::string* error) {
     DisplayInfoProvider::GetProvider()->SetInfo(display_id, info,
@@ -69,14 +69,14 @@ class DisplayInfoProviderChromeosTest : public ash::test::AshTestBase {
   }
 
   std::string SystemInfoDisplayInsetsToString(
-      const api::system_info_display::Insets& insets) const {
+      const api::system_display::Insets& insets) const {
     // Order to match gfx::Insets::ToString().
     return base::StringPrintf("%d,%d,%d,%d",
         insets.top,  insets.left, insets.bottom, insets.right);
   }
 
   std::string SystemInfoDisplayBoundsToString(
-      const api::system_info_display::Bounds& bounds) const {
+      const api::system_display::Bounds& bounds) const {
     // Order to match gfx::Rect::ToString().
     return base::StringPrintf("%d,%d %dx%d",
         bounds.left,  bounds.top, bounds.width, bounds.height);
@@ -333,7 +333,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftExact) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-520));
   info.bounds_origin_y.reset(new int(50));
 
@@ -352,7 +352,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginRightExact) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(1200));
   info.bounds_origin_y.reset(new int(100));
 
@@ -371,7 +371,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopExact) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(1100));
   info.bounds_origin_y.reset(new int(-400));
 
@@ -390,7 +390,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginBottomExact) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-350));
   info.bounds_origin_y.reset(new int(600));
 
@@ -409,7 +409,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSameCenter) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(340));
   info.bounds_origin_y.reset(new int(100));
 
@@ -428,7 +428,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginLeftOutside) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-1040));
   info.bounds_origin_y.reset(new int(100));
 
@@ -447,7 +447,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginTopOutside) {
   UpdateDisplay("1200x600,520x400");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-360));
   info.bounds_origin_y.reset(new int(-301));
 
@@ -467,7 +467,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
   UpdateDisplay("1200x600,1000x100");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-650));
   info.bounds_origin_y.reset(new int(700));
 
@@ -487,7 +487,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
   UpdateDisplay("1200x600,1000x100");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(850));
   info.bounds_origin_y.reset(new int(-150));
 
@@ -507,7 +507,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
   UpdateDisplay("1200x600,1000x100/l");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(-150));
   info.bounds_origin_y.reset(new int(-650));
 
@@ -527,7 +527,7 @@ TEST_F(DisplayInfoProviderChromeosTest,
   UpdateDisplay("1200x600,1000x100/l");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(1350));
   info.bounds_origin_y.reset(new int(450));
 
@@ -546,7 +546,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginPrimaryHiDPI) {
   UpdateDisplay("1200x600*2,500x500");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(250));
   info.bounds_origin_y.reset(new int(-100));
 
@@ -565,7 +565,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginSecondaryHiDPI) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(450));
   info.bounds_origin_y.reset(new int(-100));
 
@@ -584,7 +584,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBounds) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(0x200001));
   info.bounds_origin_y.reset(new int(-100));
 
@@ -603,7 +603,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOutOfBoundsNegative) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(300));
   info.bounds_origin_y.reset(new int(-0x200001));
 
@@ -622,7 +622,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginMaxValues) {
   UpdateDisplay("1200x4600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(200000));
   info.bounds_origin_y.reset(new int(10));
 
@@ -641,7 +641,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginOnPrimary) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(300));
   info.is_primary.reset(new bool(true));
 
@@ -665,7 +665,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetBoundsOriginWithMirroring) {
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
   const gfx::Display& primary = GetDisplayController()->GetPrimaryDisplay();
 
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.bounds_origin_x.reset(new int(300));
   info.mirroring_source_id.reset(
       new std::string(base::Int64ToString(primary.id())));
@@ -684,7 +684,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetRotation) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.rotation.reset(new int(90));
 
   bool success = false;
@@ -737,7 +737,7 @@ TEST_F(DisplayInfoProviderChromeosTest, SetInvalidRotation) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
+  api::system_display::DisplayProperties info;
   info.rotation.reset(new int(91));
 
   bool success = false;
@@ -753,8 +753,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetNegativeOverscan) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
-  info.overscan.reset(new api::system_info_display::Insets);
+  api::system_display::DisplayProperties info;
+  info.overscan.reset(new api::system_display::Insets);
   info.overscan->left= -10;
 
   bool success = false;
@@ -816,8 +816,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanHorizontalBounds) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
-  info.overscan.reset(new api::system_info_display::Insets);
+  api::system_display::DisplayProperties info;
+  info.overscan.reset(new api::system_display::Insets);
   // Horizontal overscan is 151, which would make the bounds width 149.
   info.overscan->left= 50;
   info.overscan->top = 10;
@@ -838,8 +838,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanLargerThanVerticalBounds) {
   UpdateDisplay("1200x600,600x1000");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
-  info.overscan.reset(new api::system_info_display::Insets);
+  api::system_display::DisplayProperties info;
+  info.overscan.reset(new api::system_display::Insets);
   // Vertical overscan is 501, which would make the bounds height 499.
   info.overscan->left= 20;
   info.overscan->top = 250;
@@ -860,8 +860,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscan) {
   UpdateDisplay("1200x600,600x1000*2");
 
   const gfx::Display& secondary = ash::ScreenAsh::GetSecondaryDisplay();
-  api::system_info_display::DisplayProperties info;
-  info.overscan.reset(new api::system_info_display::Insets);
+  api::system_display::DisplayProperties info;
+  info.overscan.reset(new api::system_display::Insets);
   info.overscan->left= 20;
   info.overscan->top = 199;
   info.overscan->right = 130;
@@ -891,8 +891,8 @@ TEST_F(DisplayInfoProviderChromeosTest, SetOverscanForInternal) {
       ash::test::DisplayManagerTestApi(GetDisplayManager()).
       SetFirstDisplayAsInternalDisplay();
 
-  api::system_info_display::DisplayProperties info;
-  info.overscan.reset(new api::system_info_display::Insets);
+  api::system_display::DisplayProperties info;
+  info.overscan.reset(new api::system_display::Insets);
   // Vertical overscan is 501, which would make the bounds height 499.
   info.overscan->left= 20;
   info.overscan->top = 20;
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider_mac.cc b/chrome/browser/extensions/api/system_display/display_info_provider_mac.cc
index 3ff9d6b..2b22e1e 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider_mac.cc
+++ b/chrome/browser/extensions/api/system_display/display_info_provider_mac.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_info_display/display_info_provider.h"
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 
 namespace extensions {
 
@@ -13,7 +13,7 @@ void DisplayInfoProvider::RequestInfo(const RequestInfoCallback& callback) {
 
 void DisplayInfoProvider::SetInfo(
     const std::string& display_id,
-    const api::system_info_display::DisplayProperties& info,
+    const api::system_display::DisplayProperties& info,
     const SetInfoCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider_win.cc b/chrome/browser/extensions/api/system_display/display_info_provider_win.cc
index e242fbb..9d21278 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider_win.cc
+++ b/chrome/browser/extensions/api/system_display/display_info_provider_win.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_info_display/display_info_provider.h"
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 
 #include <windows.h>
 
@@ -13,8 +13,8 @@
 
 namespace extensions {
 
-using api::system_info_display::Bounds;
-using api::system_info_display::DisplayUnitInfo;
+using api::system_display::Bounds;
+using api::system_display::DisplayUnitInfo;
 
 namespace {
 
@@ -74,7 +74,7 @@ void DisplayInfoProvider::RequestInfo(const RequestInfoCallback& callback) {
 
 void DisplayInfoProvider::SetInfo(
     const std::string& display_id,
-    const api::system_info_display::DisplayProperties& info,
+    const api::system_display::DisplayProperties& info,
     const SetInfoCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
diff --git a/chrome/browser/extensions/api/system_info_display/display_info_provider_x11.cc b/chrome/browser/extensions/api/system_display/display_info_provider_x11.cc
index a3f46d0..adfdb14 100644
--- a/chrome/browser/extensions/api/system_info_display/display_info_provider_x11.cc
+++ b/chrome/browser/extensions/api/system_display/display_info_provider_x11.cc
@@ -1,8 +1,8 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_info_display/display_info_provider.h"
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
 
 namespace extensions {
 
@@ -13,7 +13,7 @@ void DisplayInfoProvider::RequestInfo(const RequestInfoCallback& callback) {
 
 void DisplayInfoProvider::SetInfo(
     const std::string& display_id,
-    const api::system_info_display::DisplayProperties& info,
+    const api::system_display::DisplayProperties& info,
     const SetInfoCallback& callback) {
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
diff --git a/chrome/browser/extensions/api/system_info_display/system_info_display_api.cc b/chrome/browser/extensions/api/system_display/system_display_api.cc
index d2c8748..8819a8c 100644
--- a/chrome/browser/extensions/api/system_info_display/system_info_display_api.cc
+++ b/chrome/browser/extensions/api/system_display/system_display_api.cc
@@ -1,30 +1,30 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_info_display/system_info_display_api.h"
+#include "chrome/browser/extensions/api/system_display/system_display_api.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/common/extensions/manifest_handlers/kiosk_enabled_info.h"
 
 namespace extensions {
 
-using api::system_info_display::DisplayUnitInfo;
+using api::system_display::DisplayUnitInfo;
 
-namespace SetDisplayProperties = api::system_info_display::SetDisplayProperties;
+namespace SetDisplayProperties = api::system_display::SetDisplayProperties;
 
-bool SystemInfoDisplayGetDisplayInfoFunction::RunImpl() {
+bool SystemDisplayGetInfoFunction::RunImpl() {
   DisplayInfoProvider::GetProvider()->RequestInfo(
       base::Bind(
-          &SystemInfoDisplayGetDisplayInfoFunction::OnGetDisplayInfoCompleted,
+          &SystemDisplayGetInfoFunction::OnGetDisplayInfoCompleted,
           this));
   return true;
 }
 
-void SystemInfoDisplayGetDisplayInfoFunction::OnGetDisplayInfoCompleted(
+void SystemDisplayGetInfoFunction::OnGetDisplayInfoCompleted(
     bool success) {
   if (success) {
-    results_ = api::system_info_display::GetDisplayInfo::Results::Create(
+    results_ = api::system_display::GetInfo::Results::Create(
                    DisplayInfoProvider::GetProvider()->display_info());
   } else {
     SetError("Error occurred when querying display information.");
@@ -32,7 +32,7 @@ void SystemInfoDisplayGetDisplayInfoFunction::OnGetDisplayInfoCompleted(
   SendResponse(success);
 }
 
-bool SystemInfoDisplaySetDisplayPropertiesFunction::RunImpl() {
+bool SystemDisplaySetDisplayPropertiesFunction::RunImpl() {
 #if !defined(OS_CHROMEOS)
   SetError("Function available only on ChromeOS.");
   return false;
@@ -46,13 +46,13 @@ bool SystemInfoDisplaySetDisplayPropertiesFunction::RunImpl() {
       SetDisplayProperties::Params::Create(*args_));
   DisplayInfoProvider::GetProvider()->SetInfo(params->id, params->info,
       base::Bind(
-          &SystemInfoDisplaySetDisplayPropertiesFunction::OnPropertiesSet,
+          &SystemDisplaySetDisplayPropertiesFunction::OnPropertiesSet,
           this));
   return true;
 #endif
 }
 
-void SystemInfoDisplaySetDisplayPropertiesFunction::OnPropertiesSet(
+void SystemDisplaySetDisplayPropertiesFunction::OnPropertiesSet(
     bool success, const std::string& error) {
   if (!success)
     SetError(error);
diff --git a/chrome/browser/extensions/api/system_display/system_display_api.h b/chrome/browser/extensions/api/system_display/system_display_api.h
new file mode 100644
index 0000000..ee63e74
--- /dev/null
+++ b/chrome/browser/extensions/api/system_display/system_display_api.h
@@ -0,0 +1,44 @@
+// 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.
+
+#ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_DISPLAY_SYSTEM_DISPLAY_API_H_
+#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_DISPLAY_SYSTEM_DISPLAY_API_H_
+
+#include <string>
+
+#include "chrome/browser/extensions/api/system_display/display_info_provider.h"
+#include "chrome/browser/extensions/extension_function.h"
+
+namespace extensions {
+
+class SystemDisplayGetInfoFunction : public AsyncExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION("system.display.getInfo",
+                             SYSTEM_DISPLAY_GETINFO);
+
+ protected:
+  virtual ~SystemDisplayGetInfoFunction() {}
+  virtual bool RunImpl() OVERRIDE;
+
+ private:
+  void OnGetDisplayInfoCompleted(bool success);
+};
+
+class SystemDisplaySetDisplayPropertiesFunction
+    : public AsyncExtensionFunction {
+ public:
+  DECLARE_EXTENSION_FUNCTION("system.display.setDisplayProperties",
+                             SYSTEM_DISPLAY_SETDISPLAYPROPERTIES);
+
+ protected:
+  virtual ~SystemDisplaySetDisplayPropertiesFunction() {}
+  virtual bool RunImpl() OVERRIDE;
+
+ private:
+  void OnPropertiesSet(bool success, const std::string& error);
+};
+
+}  // namespace extensions
+
+#endif  // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_DISPLAY_SYSTEM_DISPLAY_API_H_
diff --git a/chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc
index ec254d7..7880c46 100644
--- a/chrome/browser/extensions/api/system_info_display/system_info_display_apitest.cc
+++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc
@@ -1,11 +1,11 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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_info_display/system_info_display_api.h"
+#include "chrome/browser/extensions/api/system_display/system_display_api.h"
 
 #include "base/strings/string_number_conversions.h"
-#include "chrome/browser/extensions/api/system_info_display/display_info_provider.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"
 
@@ -13,8 +13,8 @@ namespace utils = extension_function_test_utils;
 
 namespace extensions {
 
-using api::system_info_display::Bounds;
-using api::system_info_display::DisplayUnitInfo;
+using api::system_display::Bounds;
+using api::system_display::DisplayUnitInfo;
 
 class MockDisplayInfoProvider : public DisplayInfoProvider {
  public:
@@ -55,7 +55,7 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
 
   virtual void SetInfo(
       const std::string& display_id,
-      const api::system_info_display::DisplayProperties& params,
+      const api::system_display::DisplayProperties& params,
       const SetInfoCallback& callback) OVERRIDE {
     // Should get called only once per test case.
     EXPECT_FALSE(set_info_value_);
@@ -81,10 +81,10 @@ class MockDisplayInfoProvider : public DisplayInfoProvider {
   DISALLOW_COPY_AND_ASSIGN(MockDisplayInfoProvider);
 };
 
-class SystemInfoDisplayApiTest: public ExtensionApiTest {
+class SystemDisplayApiTest: public ExtensionApiTest {
  public:
-  SystemInfoDisplayApiTest() {}
-  virtual ~SystemInfoDisplayApiTest() {}
+  SystemDisplayApiTest() {}
+  virtual ~SystemDisplayApiTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
@@ -102,17 +102,17 @@ class SystemInfoDisplayApiTest: public ExtensionApiTest {
  protected:
   scoped_refptr<MockDisplayInfoProvider> provider_;
 
-  DISALLOW_COPY_AND_ASSIGN(SystemInfoDisplayApiTest);
+  DISALLOW_COPY_AND_ASSIGN(SystemDisplayApiTest);
 };
 
-IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, GetDisplay) {
-  ASSERT_TRUE(RunPlatformAppTest("systeminfo/display")) << message_;
+IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, GetDisplay) {
+  ASSERT_TRUE(RunPlatformAppTest("system/display")) << message_;
 }
 
 #if !defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, SetDisplay) {
-  scoped_refptr<SystemInfoDisplaySetDisplayPropertiesFunction>
-      set_info_function(new SystemInfoDisplaySetDisplayPropertiesFunction());
+IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplay) {
+  scoped_refptr<SystemDisplaySetDisplayPropertiesFunction>
+      set_info_function(new SystemDisplaySetDisplayPropertiesFunction());
 
   set_info_function->set_has_callback(true);
 
@@ -127,7 +127,7 @@ IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, SetDisplay) {
 #endif  // !defined(OS_CHROMEOS)
 
 #if defined(OS_CHROMEOS)
-IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, SetDisplayNotKioskEnabled) {
+IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplayNotKioskEnabled) {
   scoped_ptr<base::DictionaryValue> test_extension_value(utils::ParseDictionary(
       "{\n"
       "  \"name\": \"Test\",\n"
@@ -141,8 +141,8 @@ IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, SetDisplayNotKioskEnabled) {
   scoped_refptr<Extension> test_extension(
       utils::CreateExtension(test_extension_value.get()));
 
-  scoped_refptr<SystemInfoDisplaySetDisplayPropertiesFunction>
-      set_info_function(new SystemInfoDisplaySetDisplayPropertiesFunction());
+  scoped_refptr<SystemDisplaySetDisplayPropertiesFunction>
+      set_info_function(new SystemDisplaySetDisplayPropertiesFunction());
 
   set_info_function->set_extension(test_extension.get());
   set_info_function->set_has_callback(true);
@@ -156,7 +156,7 @@ IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, SetDisplayNotKioskEnabled) {
   EXPECT_FALSE(set_info);
 }
 
-IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, SetDisplayKioskEnabled) {
+IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplayKioskEnabled) {
   scoped_ptr<base::DictionaryValue> test_extension_value(utils::ParseDictionary(
       "{\n"
       "  \"name\": \"Test\",\n"
@@ -171,8 +171,8 @@ IN_PROC_BROWSER_TEST_F(SystemInfoDisplayApiTest, SetDisplayKioskEnabled) {
   scoped_refptr<Extension> test_extension(
       utils::CreateExtension(test_extension_value.get()));
 
-  scoped_refptr<SystemInfoDisplaySetDisplayPropertiesFunction>
-      set_info_function(new SystemInfoDisplaySetDisplayPropertiesFunction());
+  scoped_refptr<SystemDisplaySetDisplayPropertiesFunction>
+      set_info_function(new SystemDisplaySetDisplayPropertiesFunction());
 
   set_info_function->set_has_callback(true);
   set_info_function->set_extension(test_extension.get());
diff --git a/chrome/browser/extensions/api/system_info_display/system_info_display_api.h b/chrome/browser/extensions/api/system_info_display/system_info_display_api.h
deleted file mode 100644
index db427e5..0000000
--- a/chrome/browser/extensions/api/system_info_display/system_info_display_api.h
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright (c) 2012 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.
-
-#ifndef CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_DISPLAY_SYSTEM_INFO_DISPLAY_API_H_
-#define CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_DISPLAY_SYSTEM_INFO_DISPLAY_API_H_
-
-#include <string>
-
-#include "chrome/browser/extensions/api/system_info_display/display_info_provider.h"
-#include "chrome/browser/extensions/extension_function.h"
-
-namespace extensions {
-
-class SystemInfoDisplayGetDisplayInfoFunction : public AsyncExtensionFunction {
- public:
-  DECLARE_EXTENSION_FUNCTION("systemInfo.display.getDisplayInfo",
-                             SYSTEMINFO_DISPLAY_GETDISPLAYINFO);
-
- protected:
-  virtual ~SystemInfoDisplayGetDisplayInfoFunction() {}
-  virtual bool RunImpl() OVERRIDE;
-
- private:
-  void OnGetDisplayInfoCompleted(bool success);
-};
-
-class SystemInfoDisplaySetDisplayPropertiesFunction
-    : public AsyncExtensionFunction {
- public:
-  DECLARE_EXTENSION_FUNCTION("systemInfo.display.setDisplayProperties",
-                             SYSTEMINFO_DISPLAY_SETDISPLAYPROPERTIES);
-
- protected:
-  virtual ~SystemInfoDisplaySetDisplayPropertiesFunction() {}
-  virtual bool RunImpl() OVERRIDE;
-
- private:
-  void OnPropertiesSet(bool success, const std::string& error);
-};
-
-}  // namespace extensions
-
-#endif  // CHROME_BROWSER_EXTENSIONS_API_SYSTEM_INFO_DISPLAY_SYSTEM_INFO_DISPLAY_API_H__
diff --git a/chrome/browser/extensions/event_names.cc b/chrome/browser/extensions/event_names.cc
index 32700439..c5eeeba 100644
--- a/chrome/browser/extensions/event_names.cc
+++ b/chrome/browser/extensions/event_names.cc
@@ -71,7 +71,7 @@ const char kBluetoothOnDeviceSearchResult[] = "bluetooth.onDeviceSearchResult";
 
 const char kOnPushMessage[] = "pushMessaging.onMessage";
 
-const char kOnDisplayChanged[] = "systemInfo.display.onDisplayChanged";
+const char kOnDisplayChanged[] = "system.display.onDisplayChanged";
 const char kOnStorageAvailableCapacityChanged[] =
     "experimental.systemInfo.storage.onAvailableCapacityChanged";
 const char kOnStorageAttached[] = "experimental.systemInfo.storage.onAttached";
diff --git a/chrome/browser/extensions/extension_function_histogram_value.h b/chrome/browser/extensions/extension_function_histogram_value.h
index 23e218c..2bc33fc 100644
--- a/chrome/browser/extensions/extension_function_histogram_value.h
+++ b/chrome/browser/extensions/extension_function_histogram_value.h
@@ -122,7 +122,7 @@ enum HistogramValue {
   APP_CURRENTWINDOWINTERNAL_SHOW,
   WEBSTOREPRIVATE_GETBROWSERLOGIN,
   EXPERIMENTAL_IDENTITY_GETAUTHTOKEN,
-  SYSTEMINFO_DISPLAY_GETDISPLAYINFO,
+  DELETED_SYSTEMINFO_DISPLAY_GETDISPLAYINFO,
   BROWSINGDATA_REMOVEPLUGINDATA,
   SOCKET_LISTEN,
   MEDIAGALLERIES_GETMEDIAFILESYSTEMS,
@@ -548,7 +548,7 @@ enum HistogramValue {
   SYSTEMINFO_MEMORY_GET,
   ACTIVITYLOGPRIVATE_GETEXTENSIONACTIVITIES,
   RUNTIME_GETPACKAGEDIRECTORYENTRY,
-  SYSTEMINFO_DISPLAY_SETDISPLAYPROPERTIES,
+  DELETED_SYSTEMINFO_DISPLAY_SETDISPLAYPROPERTIES,
   FEEDBACKPRIVATE_GETUSEREMAIL,
   FEEDBACKPRIVATE_GETSYSTEMINFORMATION,
   FEEDBACKPRIVATE_SENDFEEDBACK,
@@ -568,6 +568,8 @@ enum HistogramValue {
   EXPERIMENTAL_SYSTEMINFO_STORAGE_EJECTDEVICE,
   SYSTEM_CPU_GETINFO,
   BOOKMARKMANAGERPRIVATE_REMOVETREES,
+  SYSTEM_DISPLAY_GETINFO,
+  SYSTEM_DISPLAY_SETDISPLAYPROPERTIES,
   ENUM_BOUNDARY // Last entry: Add new entries above.
 };
 
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 3138b2e..c974d6f 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -449,14 +449,14 @@
         'browser/extensions/api/system_indicator/system_indicator_manager.h',
         'browser/extensions/api/system_indicator/system_indicator_manager_factory.cc',
         'browser/extensions/api/system_indicator/system_indicator_manager_factory.h',
-        'browser/extensions/api/system_info_display/display_info_provider.cc',
-        'browser/extensions/api/system_info_display/display_info_provider.h',
-        'browser/extensions/api/system_info_display/display_info_provider_chromeos.cc',
-        'browser/extensions/api/system_info_display/display_info_provider_mac.cc',
-        'browser/extensions/api/system_info_display/display_info_provider_win.cc',
-        'browser/extensions/api/system_info_display/display_info_provider_x11.cc',
-        'browser/extensions/api/system_info_display/system_info_display_api.cc',
-        'browser/extensions/api/system_info_display/system_info_display_api.h',
+        'browser/extensions/api/system_display/display_info_provider.cc',
+        'browser/extensions/api/system_display/display_info_provider.h',
+        'browser/extensions/api/system_display/display_info_provider_chromeos.cc',
+        'browser/extensions/api/system_display/display_info_provider_mac.cc',
+        'browser/extensions/api/system_display/display_info_provider_win.cc',
+        'browser/extensions/api/system_display/display_info_provider_x11.cc',
+        'browser/extensions/api/system_display/system_display_api.cc',
+        'browser/extensions/api/system_display/system_display_api.h',
         'browser/extensions/api/system_info_memory/memory_info_provider.cc',
         'browser/extensions/api/system_info_memory/memory_info_provider.h',
         'browser/extensions/api/system_info_memory/system_info_memory_api.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e157162..eb1ad5d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1337,7 +1337,7 @@
         'browser/extensions/api/sync_file_system/sync_file_system_apitest.cc',
         'browser/extensions/api/system_indicator/system_indicator_apitest.cc',
         'browser/extensions/api/system_cpu/system_cpu_apitest.cc',
-        'browser/extensions/api/system_info_display/system_info_display_apitest.cc',
+        'browser/extensions/api/system_display/system_display_apitest.cc',
         'browser/extensions/api/system_info_memory/system_info_memory_apitest.cc',
         'browser/extensions/api/system_info_storage/system_info_storage_apitest.cc',
         'browser/extensions/api/system_private/system_private_apitest.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index b3b1617..4a854e3 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -794,7 +794,7 @@
         'browser/extensions/api/storage/settings_test_util.cc',
         'browser/extensions/api/storage/settings_test_util.h',
         'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc',
-        'browser/extensions/api/system_info_display/display_info_provider_chromeos_unittest.cc',
+        'browser/extensions/api/system_display/display_info_provider_chromeos_unittest.cc',
         'browser/extensions/api/system_info_storage/storage_info_provider_unittest.cc',
         'browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc',
         'browser/extensions/api/web_request/form_data_parser_unittest.cc',
diff --git a/chrome/common/extensions/api/_api_features.json b/chrome/common/extensions/api/_api_features.json
index 887b615..dcd1d59c 100644
--- a/chrome/common/extensions/api/_api_features.json
+++ b/chrome/common/extensions/api/_api_features.json
@@ -462,8 +462,8 @@
     "dependencies": ["permission:system.cpu"],
     "contexts": ["blessed_extension"]
   },
-  "systemInfo.display": {
-    "dependencies": ["permission:systemInfo.display"],
+  "system.display": {
+    "dependencies": ["permission:system.display"],
     "contexts": ["blessed_extension"]
   },
   "systemInfo.memory": {
diff --git a/chrome/common/extensions/api/_permission_features.json b/chrome/common/extensions/api/_permission_features.json
index abf28df..71ad388 100644
--- a/chrome/common/extensions/api/_permission_features.json
+++ b/chrome/common/extensions/api/_permission_features.json
@@ -539,7 +539,7 @@
     ],
     "whitelist": [""]
   },
-  "systemInfo.display": {
+  "system.display": {
     "channel": "stable",
     "extension_types": ["extension", "packaged_app", "platform_app"]
   },
diff --git a/chrome/common/extensions/api/api.gyp b/chrome/common/extensions/api/api.gyp
index 7d7bbee..0a98a3d 100644
--- a/chrome/common/extensions/api/api.gyp
+++ b/chrome/common/extensions/api/api.gyp
@@ -93,7 +93,7 @@
           'sync_file_system.idl',
           'system_indicator.idl',
           'system_cpu.idl',
-          'system_info_display.idl',
+          'system_display.idl',
           'system_private.json',
           'tab_capture.idl',
           'tabs.json',
diff --git a/chrome/common/extensions/api/system_info_display.idl b/chrome/common/extensions/api/system_display.idl
index 71c4a8b..2a34d9e 100644
--- a/chrome/common/extensions/api/system_info_display.idl
+++ b/chrome/common/extensions/api/system_display.idl
@@ -1,9 +1,9 @@
-// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// 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.
 
-// Use the <code>systemInfo.display</code> API to query display metadata.
-namespace systemInfo.display {
+// Use the <code>system.display</code> API to query display metadata.
+namespace system.display {
 
   dictionary Bounds {
     // The x-coordinate of the upper-left corner.
@@ -108,7 +108,7 @@ namespace systemInfo.display {
     // together with <code>boundsOriginY</code>, if <code>boundsOriginY</code>
     // is set. Note that, when updating the display origin, some constraints
     // will be applied, so the final bounds origin may be different than the one
-    // set. The final bounds can be retrieved using $ref:getDisplayInfo.
+    // set. The final bounds can be retrieved using $ref:getInfo.
     // The bounds origin is applied after <code>rotation</code>.
     // The bounds origin cannot be changed on the primary display. Note that is
     // also invalid to set bounds origin values if <code>isPrimary</code> is
@@ -125,7 +125,7 @@ namespace systemInfo.display {
 
   interface Functions {
     // Get the information of all attached display devices.
-    static void getDisplayInfo(DisplayInfoCallback callback);
+    static void getInfo(DisplayInfoCallback callback);
 
     // Updates the properties for the display specified by |id|, according to
     // the information provided in |info|. On failure, $ref:runtime.lastError
diff --git a/chrome/common/extensions/docs/templates/public/apps/redirects.json b/chrome/common/extensions/docs/templates/public/apps/redirects.json
index 023eb7b..268ed65 100644
--- a/chrome/common/extensions/docs/templates/public/apps/redirects.json
+++ b/chrome/common/extensions/docs/templates/public/apps/redirects.json
@@ -2,5 +2,6 @@
   "": "about_apps.html",
   "index.html": "about_apps.html",
   "app_csp.html": "contentSecurityPolicy.html",
-  "systemInfo_cpu.html": "system_cpu.html"
+  "systemInfo_cpu.html": "system_cpu.html",
+  "systemInfo_display.html": "system_display.html"
 }
diff --git a/chrome/common/extensions/docs/templates/public/apps/systemInfo_display.html b/chrome/common/extensions/docs/templates/public/apps/systemInfo_display.html
deleted file mode 100644
index c78e3f6..0000000
--- a/chrome/common/extensions/docs/templates/public/apps/systemInfo_display.html
+++ /dev/null
@@ -1 +0,0 @@
-{{+partials.standard_apps_api api:apis.system_info_display}}
diff --git a/chrome/common/extensions/docs/templates/public/apps/system_display.html b/chrome/common/extensions/docs/templates/public/apps/system_display.html
new file mode 100644
index 0000000..0ee722f
--- /dev/null
+++ b/chrome/common/extensions/docs/templates/public/apps/system_display.html
@@ -0,0 +1 @@
+{{+partials.standard_apps_api api:apis.system_display}}
diff --git a/chrome/common/extensions/permissions/api_permission.h b/chrome/common/extensions/permissions/api_permission.h
index e1dac1d..46d13f0 100644
--- a/chrome/common/extensions/permissions/api_permission.h
+++ b/chrome/common/extensions/permissions/api_permission.h
@@ -115,7 +115,7 @@ class APIPermission {
     kSyncFileSystem,
     kSystemPrivate,
     kSystemIndicator,
-    kSystemInfoDisplay,
+    kSystemDisplay,
     kTab,
     kTabCapture,
     kTerminalPrivate,
diff --git a/chrome/common/extensions/permissions/chrome_api_permissions.cc b/chrome/common/extensions/permissions/chrome_api_permissions.cc
index 1fe43c1..8c1ec15 100644
--- a/chrome/common/extensions/permissions/chrome_api_permissions.cc
+++ b/chrome/common/extensions/permissions/chrome_api_permissions.cc
@@ -288,7 +288,7 @@ std::vector<APIPermissionInfo*> ChromeAPIPermissions::GetAllPermissions()
       PermissionMessage::kSystemIndicator },
     { APIPermission::kSystemCpu, "system.cpu" },
     { APIPermission::kSystemInfoMemory, "systemInfo.memory" },
-    { APIPermission::kSystemInfoDisplay, "systemInfo.display" },
+    { APIPermission::kSystemDisplay, "system.display" },
     { APIPermission::kPointerLock, "pointerLock" },
     { APIPermission::kFullscreen, "fullscreen" },
     { APIPermission::kAudio, "audio" },
diff --git a/chrome/common/extensions/permissions/permission_set_unittest.cc b/chrome/common/extensions/permissions/permission_set_unittest.cc
index 5dbdd36..2dff13b 100644
--- a/chrome/common/extensions/permissions/permission_set_unittest.cc
+++ b/chrome/common/extensions/permissions/permission_set_unittest.cc
@@ -649,7 +649,7 @@ TEST(PermissionsTest, PermissionMessages) {
   skip.insert(APIPermission::kStorage);
   skip.insert(APIPermission::kSystemCpu);
   skip.insert(APIPermission::kSystemInfoMemory);
-  skip.insert(APIPermission::kSystemInfoDisplay);
+  skip.insert(APIPermission::kSystemDisplay);
   skip.insert(APIPermission::kTts);
   skip.insert(APIPermission::kUnlimitedStorage);
   skip.insert(APIPermission::kWebView);
diff --git a/chrome/test/data/extensions/api_test/systeminfo/display/manifest.json b/chrome/test/data/extensions/api_test/system/display/manifest.json
index 542134d6..11792b6 100644
--- a/chrome/test/data/extensions/api_test/systeminfo/display/manifest.json
+++ b/chrome/test/data/extensions/api_test/system/display/manifest.json
@@ -1,8 +1,8 @@
 {
   "name": "displayinfo",
   "version": "1.0",
-  "description": "Test systemInfo.display API",
-  "permissions": ["systemInfo.display"],
+  "description": "Test system.display API",
+  "permissions": ["system.display"],
   "app": {
     "background": {
       "scripts": ["test_display_api.js"]
diff --git a/chrome/test/data/extensions/api_test/systeminfo/display/test_display_api.js b/chrome/test/data/extensions/api_test/system/display/test_display_api.js
index 7527376..0c7b53b 100644
--- a/chrome/test/data/extensions/api_test/systeminfo/display/test_display_api.js
+++ b/chrome/test/data/extensions/api_test/system/display/test_display_api.js
@@ -1,14 +1,14 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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.
 
-// systeminfo.memory api test
-// browser_tests --gtest_filter=SystemInfoMemoryApiTest.*
+// system.display api test
+// browser_tests --gtest_filter=SystemDisplayApiTest.*
 
 chrome.test.runTests([
   function testGet() {
     for(var i = 0; i < 10; ++i) {
-      chrome.systemInfo.display.getDisplayInfo(
+      chrome.system.display.getInfo(
         chrome.test.callbackPass(function(result) {
           chrome.test.assertEq(4, result.length);
           for (var i = 0; i < result.length; i++) {