Add the "options_ui" extension manifest field.

chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
index f7b5c3b7a7322a07252404853ff239ad161e517f..5d7b914c15dbc53c22f04d745f5b2dc4c2d8e4c1 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
@@ -3,8 +3,8 @@
 // found in the LICENSE file.
 
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
-#include "chrome/common/extensions/manifest_url_handler.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/manifest_handlers/options_page_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace errors = extensions::manifest_errors;
@@ -14,22 +14,24 @@ class OptionsPageManifestTest : public ExtensionManifestTest {
 
 TEST_F(OptionsPageManifestTest, OptionsPageInApps) {
   scoped_refptr<extensions::Extension> extension;
-
   // Allow options page with absolute URL in hosted apps.
   extension = LoadAndExpectSuccess("hosted_app_absolute_options.json");
   EXPECT_STREQ("http",
-               extensions::ManifestURL::GetOptionsPage(extension.get())
-                   .scheme().c_str());
-  EXPECT_STREQ(
-      "example.com",
-      extensions::ManifestURL::GetOptionsPage(extension.get()).host().c_str());
+               extensions::OptionsPageInfo::GetOptionsPage(extension.get())
+                   .scheme()
+                   .c_str());
+  EXPECT_STREQ("example.com",
+               extensions::OptionsPageInfo::GetOptionsPage(extension.get())
+                   .host()
+                   .c_str());
   EXPECT_STREQ("options.html",
-               extensions::ManifestURL::GetOptionsPage(extension.get())
-                   .ExtractFileName().c_str());
+               extensions::OptionsPageInfo::GetOptionsPage(extension.get())
+                   .ExtractFileName()
+                   .c_str());
 
   extension = LoadAndExpectSuccess("platform_app_with_options_page.json");
-  EXPECT_TRUE(extensions::ManifestURL::GetOptionsPage(extension.get())
-                  .is_empty());
+  EXPECT_TRUE(
+      extensions::OptionsPageInfo::GetOptionsPage(extension.get()).is_empty());
 
   Testcase testcases[] = {
     // Forbid options page with relative URL in hosted apps.
@@ -47,3 +49,46 @@ TEST_F(OptionsPageManifestTest, OptionsPageInApps) {
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_ERROR);
 }
+
+// Tests for the options_ui.page manifest field
+TEST_F(OptionsPageManifestTest, OptionsUIPage) {
+  scoped_refptr<extensions::Extension> extension;
+
+  extension = LoadAndExpectSuccess("options_ui_page_basic.json");
+  EXPECT_EQ(
+      "chrome-extension",
+      extensions::OptionsPageInfo::GetOptionsPage(extension.get()).scheme());
+  EXPECT_EQ(
+      "/options.html",
+      extensions::OptionsPageInfo::GetOptionsPage(extension.get()).path());

[not at google - send to devlin, 2014/08/29 05:39:23]

Odd to be comparing the parts separately. Can you just do

EXPECT_EQ(GURL("chrome-extension://options.html"),
          extensions::OptionsPageInfo::GetOptionsPage(extension.get()));

?

[ericzeng, 2014/08/29 16:52:22]

I'll need the extension id, but yes that should work. I was modeling my tests
off of the existing ones. 

[ericzeng, 2014/08/29 22:08:50]

Done.

+
+  extension = LoadAndExpectSuccess("options_ui_page_with_legacy_page.json");
+  EXPECT_EQ(
+      "chrome-extension",
+      extensions::OptionsPageInfo::GetOptionsPage(extension.get()).scheme());
+  EXPECT_EQ(
+      "/newoptions.html",
+      extensions::OptionsPageInfo::GetOptionsPage(extension.get()).path());
+
+  Testcase testcases[] = {
+      Testcase("options_ui_page_bad_url.json", errors::kInvalidOptionsUIPage)};
+  RunTestcases(testcases, arraysize(testcases), EXPECT_TYPE_ERROR);
+}
+
+// Tests for the options_ui.chrome_style and options_ui.open_in_tab fields
+TEST_F(OptionsPageManifestTest, OptionsUIChromeStyleAndOpenInTab) {
+  scoped_refptr<extensions::Extension> extension;
+
+  extension = LoadAndExpectSuccess("options_ui_flags_true.json");
+  EXPECT_TRUE(extensions::OptionsPageInfo::ChromeStyle(extension.get()));
+  EXPECT_TRUE(extensions::OptionsPageInfo::OpenInTab(extension.get()));
+
+  extension = LoadAndExpectSuccess("options_ui_flags_false.json");
+  EXPECT_FALSE(extensions::OptionsPageInfo::ChromeStyle(extension.get()));
+  EXPECT_FALSE(extensions::OptionsPageInfo::OpenInTab(extension.get()));
+
+  // If chrome_style and open_in_tab are not set, they should be false
+  extension = LoadAndExpectSuccess("options_ui_page_basic.json");
+  EXPECT_FALSE(extensions::OptionsPageInfo::ChromeStyle(extension.get()));
+  EXPECT_FALSE(extensions::OptionsPageInfo::OpenInTab(extension.get()));
+}

[not at google - send to devlin, 2014/08/29 05:39:23]

Could you add tests with the feature switch turned on/off?

[ericzeng, 2014/08/29 16:52:22]

The feature switch doesn't affect any of the manifest code, plus I thought we
were removing it soon?

[ericzeng, 2014/08/29 22:08:50]

Done.