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

extensions/browser/api/system_display/system_display_apitest.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 <stdint.h>
 
 #include <utility>
 
 #include "base/debug/leak_annotations.h"
 #include "base/macros.h"
@@ skipping 135 matching lines @@
   }
 
  protected:
   std::unique_ptr<MockDisplayInfoProvider> provider_;
   std::unique_ptr<display::Screen> screen_;
 
  private:
   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());
 
   set_info_function->set_has_callback(true);
 
   EXPECT_EQ(
       SystemDisplayFunction::kCrosOnlyError,
       api_test_utils::RunFunctionAndReturnError(
           set_info_function.get(), "[\"display_id\", {}]", browser_context()));
 
   std::unique_ptr<base::DictionaryValue> set_info =
       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"
                                       "  \"name\": \"Test\",\n"
                                       "  \"version\": \"1.0\",\n"
                                       "  \"app\": {\n"
                                       "    \"background\": {\n"
                                       "      \"scripts\": [\"background.js\"]\n"
                                       "    }\n"
                                       "  }\n"
@@ skipping 103 matching lines @@
             new SystemDisplayEnableUnifiedDesktopFunction());
 
     enable_unified_function->set_has_callback(true);
     enable_unified_function->set_extension(test_extension.get());
     ASSERT_TRUE(api_test_utils::RunFunction(enable_unified_function.get(),
                                             "[false]", browser_context()));
     EXPECT_FALSE(provider_->unified_desktop_enabled());
   }
 }
 
-#endif  // defined(OS_CHROMEOS)
+#endif  // !defined(OS_CHROMEOS)
 
 }  // namespace extensions