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

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

Index: chrome/common/extensions/api/extension_urls/options_manifest_unittest.cc
diff --git a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc b/chrome/common/extensions/api/extension_urls/options_manifest_unittest.cc
similarity index 61%
rename from chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
rename to chrome/common/extensions/api/extension_urls/options_manifest_unittest.cc
index 2eef91d0ecefcdc38d39141d73724dde27e20b03..af0ec2d6d6115846d7022c3a65044be3df16c766 100644
--- a/chrome/common/extensions/manifest_tests/extension_manifests_options_unittest.cc
+++ b/chrome/common/extensions/api/extension_urls/options_manifest_unittest.cc
@@ -4,22 +4,34 @@
 
 #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_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-namespace errors = extension_manifest_errors;
+namespace extensions {
 
-TEST_F(ExtensionManifestTest, OptionsPageInApps) {
+class OptionsManifestTest : public ExtensionManifestTest {
+ protected:
+  virtual void SetUp() OVERRIDE {
+    ExtensionManifestTest::SetUp();
+    ManifestHandler::Register(extension_manifest_keys::kOptionsPage,
+                              new OptionsPageHandler);
+  }
+};
+
+TEST_F(OptionsManifestTest, 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",
-               extension->options_url().scheme().c_str());
+               ExtensionURL::GetOptionsURL(extension).scheme().c_str());
   EXPECT_STREQ("example.com",
-               extension->options_url().host().c_str());
-  EXPECT_STREQ("options.html",
-               extension->options_url().ExtractFileName().c_str());
+               ExtensionURL::GetOptionsURL(extension).host().c_str());
+  EXPECT_STREQ(
+      "options.html",
+      ExtensionURL::GetOptionsURL(extension).ExtractFileName().c_str());
 
   Testcase testcases[] = {
     // Forbid options page with relative URL in hosted apps.
@@ -37,3 +49,5 @@ TEST_F(ExtensionManifestTest, OptionsPageInApps) {
   RunTestcases(testcases, arraysize(testcases),
                EXPECT_TYPE_ERROR);
 }
+
+}  // namespace extensions