Add Get/SetDisplayLayout to chrome.system.display extension API

extensions/browser/api/system_display/system_display_apitest.cc

Index: extensions/browser/api/system_display/system_display_apitest.cc
diff --git a/extensions/browser/api/system_display/system_display_apitest.cc b/extensions/browser/api/system_display/system_display_apitest.cc
index 94badf48dd65b8138aeafe99d7b16d804f438be6..deeb22946080ade2963ecb95004e99156f332142 100644
--- a/extensions/browser/api/system_display/system_display_apitest.cc
+++ b/extensions/browser/api/system_display/system_display_apitest.cc
@@ -153,11 +153,12 @@ class SystemDisplayApiTest : public ShellApiTest {
   DISALLOW_COPY_AND_ASSIGN(SystemDisplayApiTest);
 };
 
-IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, GetDisplay) {
-  ASSERT_TRUE(RunAppTest("system/display")) << message_;
+IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, GetDisplayInfo) {
+  ASSERT_TRUE(RunAppTest("system/display/info")) << message_;
 }
 
 #if !defined(OS_CHROMEOS)
+
 IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplay) {
   scoped_refptr<SystemDisplaySetDisplayPropertiesFunction> set_info_function(
       new SystemDisplaySetDisplayPropertiesFunction());
@@ -173,9 +174,12 @@ IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplay) {
       provider_->GetSetInfoValue();
   EXPECT_FALSE(set_info);
 }
-#endif  // !defined(OS_CHROMEOS)
 
-#if defined(OS_CHROMEOS)
+#else  // !defined(OS_CHROMEOS)
+
+// TODO(stevenjb): Add API tests for {GS}etDisplayLayout. That code currently
+// lives in src/chrome but should be getting moved soon.
+
 IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, SetDisplayNotKioskEnabled) {
   std::unique_ptr<base::DictionaryValue> test_extension_value(
       api_test_utils::ParseDictionary("{\n"
@@ -299,6 +303,6 @@ IN_PROC_BROWSER_TEST_F(SystemDisplayApiTest, EnableUnifiedDesktop) {
   }
 }
 
-#endif  // defined(OS_CHROMEOS)
+#endif  // !defined(OS_CHROMEOS)
 
 }  // namespace extensions