Move [Homepage,Options,Update,DevTools]URL out of Extension

chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc

Index: chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
index 30e597d9ca61958876cf860edc67cd97255dca47..67bc4e982ebc77dcb1cfece61769bc611debb983 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
+++ b/chrome/common/extensions/manifest_tests/extension_manifests_initvalue_unittest.cc
@@ -8,8 +8,10 @@
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/api/extension_urls/extension_urls_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ -19,7 +21,18 @@
 
 namespace errors = extension_manifest_errors;
 
-TEST_F(ExtensionManifestTest, InitFromValueInvalid) {
+namespace extensions {
+
+class InitFromValueManifestTest : public ExtensionManifestTest {
+ protected:
+  virtual void SetUp() OVERRIDE {
+    ExtensionManifestTest::SetUp();
+    ManifestHandler::Register(extension_manifest_keys::kOptionsPage,
+                              new OptionsPageHandler);
+  }
+};
+
+TEST_F(InitFromValueManifestTest, InitFromValueInvalid) {
   Testcase testcases[] = {
     Testcase("init_invalid_version_missing.json", errors::kInvalidVersion),
     Testcase("init_invalid_version_invalid.json", errors::kInvalidVersion),
@@ -71,7 +84,7 @@ TEST_F(ExtensionManifestTest, InitFromValueInvalid) {
                EXPECT_TYPE_ERROR);
 }
 
-TEST_F(ExtensionManifestTest, InitFromValueValid) {
+TEST_F(InitFromValueManifestTest, InitFromValueValid) {
   scoped_refptr<extensions::Extension> extension(LoadAndExpectSuccess(
       "init_valid_minimal.json"));
 
@@ -93,8 +106,10 @@ TEST_F(ExtensionManifestTest, InitFromValueValid) {
 
   // 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",
+            ExtensionURL::GetOptionsURL(extension).scheme());
+  EXPECT_EQ("/options.html",
+            extensions::ExtensionURL::GetOptionsURL(extension).path());
 
   Testcase testcases[] = {
     // Test that an empty list of page actions does not stop a browser action
@@ -122,7 +137,7 @@ TEST_F(ExtensionManifestTest, InitFromValueValid) {
                EXPECT_TYPE_SUCCESS);
 }
 
-TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) {
+TEST_F(InitFromValueManifestTest, InitFromValueValidNameInRTL) {
 #if defined(TOOLKIT_GTK)
   GtkTextDirection gtk_dir = gtk_widget_get_default_direction();
   gtk_widget_set_default_direction(GTK_TEXT_DIR_RTL);
@@ -153,3 +168,5 @@ TEST_F(ExtensionManifestTest, InitFromValueValidNameInRTL) {
   base::i18n::SetICUDefaultLocale(locale);
 #endif
 }
+
+}  // namespace extensions