First stage of launch for embedded options pages. With this patch, extensions

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 03527cb8bc1dc6e7f6b3203b57985b591a27d527..941c62e57aca58bd66b4d9ecadf242ffd8b020e8 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
@@ -65,42 +65,61 @@ TEST_F(OptionsPageManifestTest, OptionsUIPage) {
   RunTestcases(testcases, arraysize(testcases), EXPECT_TYPE_WARNING);
 }
 
-// Tests for the options_ui.chrome_style and options_ui.open_in_tab fields.
+// Tests for the options_ui.chrome_style and options_ui.open_in_tab fields with
+// the flag enabled. This makes open_in_tab default to true if unspecified.
 TEST_F(OptionsPageManifestTest, OptionsUIChromeStyleAndOpenInTab) {
   FeatureSwitch::ScopedOverride enable_flag(
       FeatureSwitch::embedded_extension_options(), true);
 
+  // Explicitly specifying true in the manifest for options_ui.chrome_style and
+  // options_ui.open_in_tab sets them both to true.
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("options_ui_flags_true.json");
   EXPECT_TRUE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
   EXPECT_TRUE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
 
+  // Explicitly specifying false in the manifest for options_ui.chrome_style
+  // and options_ui.open_in_tab sets them both to false.
   extension = LoadAndExpectSuccess("options_ui_flags_false.json");
   EXPECT_FALSE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
   EXPECT_FALSE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
 
-  // If chrome_style and open_in_tab are not set, they should be false.
+  // Specifying an options_ui key but neither options_ui.chrome_style nor
+  // options_ui.open_in_tab uses the default values: false for open-in-tab,
+  // false for use-chrome-style.
   extension = LoadAndExpectSuccess("options_ui_page_basic.json");
   EXPECT_FALSE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
   EXPECT_FALSE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
+
+  // Likewise specifying no options_ui key at all.
+  extension = LoadAndExpectSuccess("init_valid_options.json");
+  EXPECT_FALSE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
+  EXPECT_FALSE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
 }
 
 // Tests for the options_ui.chrome_style and options_ui.open_in_tab fields when
-// the flag for embedded extension options is turned off. chrome_style should
-// always be false, open_in_tab should always be true.
+// the flag for embedded extension options is turned off. This makes
+// open_in_tab default to false.
 TEST_F(OptionsPageManifestTest, OptionsUIChromeStyleAndOpenInTabNoFlag) {
   ASSERT_FALSE(FeatureSwitch::embedded_extension_options()->IsEnabled());
 
+  // These conditions are the same as OptionsUIChromeStyleAndOpenInTab, except
+  // when the flag is off the default for open-in-tab is true.
+
   scoped_refptr<Extension> extension =
       LoadAndExpectSuccess("options_ui_flags_true.json");
-  EXPECT_FALSE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
+  EXPECT_TRUE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
   EXPECT_TRUE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
 
   extension = LoadAndExpectSuccess("options_ui_flags_false.json");
   EXPECT_FALSE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
-  EXPECT_TRUE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
+  EXPECT_FALSE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
 
   extension = LoadAndExpectSuccess("options_ui_page_basic.json");
   EXPECT_FALSE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
   EXPECT_TRUE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
+
+  extension = LoadAndExpectSuccess("init_valid_options.json");
+  EXPECT_FALSE(OptionsPageInfo::ShouldUseChromeStyle(extension.get()));
+  EXPECT_TRUE(OptionsPageInfo::ShouldOpenInTab(extension.get()));
 }