Move the parsing of 'update_url' & 'options_page' URLs out of Extension.

chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc

 // 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.
 
-#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
-
 #include "base/i18n/rtl.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
+#include "chrome/common/extensions/manifest_url_info.h"
+#include "chrome/common/extensions/options_page_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(TOOLKIT_GTK)
 #include <gtk/gtk.h>
 #endif
 
+namespace keys = extension_manifest_keys;

[Yoyo Zhou, 2013/01/03 23:16:00]

no need for this if it's only used once.

[Joe Thomas, 2013/01/04 01:36:27]

Done.

 namespace errors = extension_manifest_errors;
 
-TEST_F(ExtensionManifestTest, InitFromValueInvalid) {
+namespace {

[Yoyo Zhou, 2013/01/03 23:16:00]

I don't think the prevailing style is to put these in an anonymous namespace.

(Same comments in the other test files.)

[Joe Thomas, 2013/01/04 01:36:27]

Done.

+
+class InitValueManifestTest : public ExtensionManifestTest {
+  virtual void SetUp() OVERRIDE {
+    ExtensionManifestTest::SetUp();
+    extensions::ManifestHandler::Register(keys::kOptionsPage,
+                                          new extensions::OptionsPageHandler);
+  }
+};
+
+TEST_F(InitValueManifestTest, InitFromValueInvalid) {
   Testcase testcases[] = {
     Testcase("init_invalid_version_missing.json", errors::kInvalidVersion),
     Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion),
     Testcase("init_invalid_name_missing.json", errors::kInvalidName),
     Testcase("init_invalid_name_invalid.json", errors::kInvalidName),
     Testcase("init_invalid_description_invalid.json",
              errors::kInvalidDescription),
     Testcase("init_invalid_icons_invalid.json", errors::kInvalidIcons),
     Testcase("init_invalid_icons_path_invalid.json", errors::kInvalidIconPath),
     Testcase("init_invalid_script_invalid.json",
@@ skipping 31 matching lines @@
     Testcase("init_invalid_min_chrome_invalid.json",
              errors::kInvalidMinimumChromeVersion),
     Testcase("init_invalid_chrome_version_too_low.json",
              errors::kChromeVersionTooLow),
   };
 
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_ERROR);
 }
 
-TEST_F(ExtensionManifestTest, InitFromValueValid) {
+TEST_F(InitValueManifestTest, InitFromValueValid) {
   scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess(
       "init_valid_minimal.json"));
 
   FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("extensions");
 
   EXPECT_TRUE(extensions::Extension::IdIsValid(extension->id()));
   EXPECT_EQ("1.0.0.0", extension->VersionString());
   EXPECT_EQ("my extension", extension->name());
   EXPECT_EQ(extension->id(), extension->url().host());
   EXPECT_EQ(extension->path(), path);
   EXPECT_EQ(path, extension->path());
 
   // Test permissions scheme.
   // We allow unknown API permissions, so this will be valid until we better
   // distinguish between API and host permissions.
   LoadAndExpectSuccess("init_valid_permissions.json");
 
   // Test with an options page.
   extension = LoadAndExpectSuccess("init_valid_options.json");
-  EXPECT_EQ("chrome-extension", extension->options_url().scheme());
-  EXPECT_EQ("/options.html", extension->options_url().path());
+  EXPECT_EQ("chrome-extension",
+            extensions::ManifestURLInfo::GetOptionsPage(extension).scheme());
+  EXPECT_EQ("/options.html",
+            extensions::ManifestURLInfo::GetOptionsPage(extension).path());
 
   Testcase testcases[] = {
     // Test that an empty list of page actions does not stop a browser action
     // from being loaded.
     Testcase("init_valid_empty_page_actions.json"),
 
     // Test with a minimum_chrome_version.
     Testcase("init_valid_minimum_chrome.json"),
 
     // Test a hosted app with a minimum_chrome_version.
     Testcase("init_valid_app_minimum_chrome.json"),
 
     // Test a hosted app with a requirements section.
     Testcase("init_valid_app_requirements.json"),
 
     // Verify empty permission settings are considered valid.
     Testcase("init_valid_permissions_empty.json"),
 
     // We allow unknown API permissions, so this will be valid until we better
     // distinguish between API and host permissions.
     Testcase("init_valid_permissions_unknown.json")
   };
 
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_SUCCESS);
 }
 
-TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) {
+TEST_F(InitValueManifestTest, InitFromValueValidNameInRTL) {
 #if defined(TOOLKIT_GTK)
   GtkTextDirection gtk_dir = gtk_widget_get_default_direction();
   gtk_widget_set_default_direction(GTK_TEXT_DIR_RTL);
 #else
   std::string locale = l10n_util::GetApplicationLocale("");
   base::i18n::SetICUDefaultLocale("he");
 #endif
 
   // No strong RTL characters in name.
   scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess(
@@ skipping 10 matching lines @@
   base::i18n::AdjustStringForLocaleDirection(&localized_name);
   EXPECT_EQ(localized_name, UTF8ToUTF16(extension->name()));
 
   // Reset locale.
 #if defined(TOOLKIT_GTK)
   gtk_widget_set_default_direction(gtk_dir);
 #else
   base::i18n::SetICUDefaultLocale(locale);
 #endif
 }
+
+}  // namespace