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

chrome/common/extensions/api/extension_urls/homepage_manifest_unittest.cc

Index: chrome/common/extensions/api/extension_urls/homepage_manifest_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc b/chrome/common/extensions/api/extension_urls/homepage_manifest_unittest.cc
similarity index 53%
rename from chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc
rename to chrome/common/extensions/api/extension_urls/homepage_manifest_unittest.cc
index 59836afebfa2ca74f3ba227d12df7dda6f03190f..e93239e26860f958b4688e83abdb50c74451add8 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_homepage_unittest.cc
+++ b/chrome/common/extensions/api/extension_urls/homepage_manifest_unittest.cc
@@ -4,41 +4,55 @@
 
 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.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"
 
-namespace errors = extension_manifest_errors;
+namespace extensions {
 
-TEST_F(ExtensionManifestTest, ParseHomepageURLs) {
-  scoped_refptr<extensions::Extension> extension(
+class HomepageManifestTest : public ExtensionManifestTest {
+ protected:
+  virtual void SetUp() OVERRIDE {
+    ExtensionManifestTest::SetUp();
+    ManifestHandler::Register(extension_manifest_keys::kHomepageURL,
+                              new HomepageURLHandler);
+  }
+};
+
+TEST_F(HomepageManifestTest, ParseHomepageURLs) {
+  scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("homepage_valid.json"));
 
   Testcase testcases[] = {
     Testcase("homepage_empty.json",
-             errors::kInvalidHomepageURL),
+             extension_manifest_errors::kInvalidHomepageURL),
     Testcase("homepage_invalid.json",
-             errors::kInvalidHomepageURL),
+             extension_manifest_errors::kInvalidHomepageURL),
     Testcase("homepage_bad_schema.json",
-             errors::kInvalidHomepageURL)
+             extension_manifest_errors::kInvalidHomepageURL)
   };
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_ERROR);
 }
 
-TEST_F(ExtensionManifestTest, GetHomepageURL) {
-  scoped_refptr<extensions::Extension> extension(
+TEST_F(HomepageManifestTest, GetHomepageURL) {
+  scoped_refptr<Extension> extension(
       LoadAndExpectSuccess("homepage_valid.json"));
-  EXPECT_EQ(GURL("http://foo.com#bar"), extension->GetHomepageURL());
+  EXPECT_EQ(GURL("http://foo.com#bar"),
+            ExtensionURL::GetHomepageURL(extension));
 
   // The Google Gallery URL ends with the id, which depends on the path, which
   // can be different in testing, so we just check the part before id.
   extension = LoadAndExpectSuccess("homepage_google_hosted.json");
-  EXPECT_TRUE(StartsWithASCII(extension->GetHomepageURL().spec(),
+  EXPECT_TRUE(StartsWithASCII(ExtensionURL::GetHomepageURL(extension).spec(),
                               "https://chrome.google.com/webstore/detail/",
                               false));
 
   extension = LoadAndExpectSuccess("homepage_externally_hosted.json");
-  EXPECT_EQ(GURL(), extension->GetHomepageURL());
+  EXPECT_EQ(GURL(), ExtensionURL::GetHomepageURL(extension));
 }
+
+}  // namespace extensions