replaced the string 'chrome-extensions://' with constants

R=thestig@chromium.org

Review URL: https://codereview.chromium.org/301033004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274077 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/extensions/input_view_browsertest.cc

@@ -16,6 +16,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
@@ -39,7 +40,9 @@ struct InputViewConfig : public VirtualKeyboardBrowserTestConfig {
     base_framework_ = kBaseKeyboardTestFramework;
     extension_id_ = id;
     test_dir_ = kInputViewTestDir;
-    url_ = "chrome-extension://" + id + "/inputview.html?id=" + layout;
+    url_ = std::string(extensions::kExtensionScheme) +
+        content::kStandardSchemeSeparator + id + "/inputview.html?id=" +
+        layout;
   }
 };
 

chrome/browser/extensions/extension_crash_recovery_browsertest.cc

@@ -18,11 +18,13 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.h"
+#include "content/public/common/url_constants.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
 #include "extensions/browser/process_map.h"
+#include "extensions/common/constants.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification_list.h"
 
@@ -528,9 +530,10 @@ IN_PROC_BROWSER_TEST_F(MAYBE_ExtensionCrashRecoveryTest,
 
   // Open a tab extension.
   chrome::NewTab(browser());
-  ui_test_utils::NavigateToURL(
-      browser(),
-      GURL("chrome-extension://" + first_extension_id_ + "/background.html"));
+  ui_test_utils::NavigateToURL(browser(),
+                               GURL(std::string(extensions::kExtensionScheme) +
+                                   content::kStandardSchemeSeparator +
+                                   first_extension_id_ + "/background.html"));
 
   const int tabs_before = tab_strip->count();
   CrashExtension(first_extension_id_);

chrome/browser/extensions/gtalk_extension_browsertest.cc

@@ -14,10 +14,12 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/common/constants.h"
 
 using content::RenderViewHost;
 using content::WebContents;
@@ -50,7 +52,9 @@ class GtalkExtensionTest : public ExtensionBrowserTest {
   }
 
   std::string GetViewerUrl() {
-    return "chrome-extension://" + GetInstalledExtensionId() + "/viewer.html";
+    return std::string(extensions::kExtensionScheme) +
+        content::kStandardSchemeSeparator + GetInstalledExtensionId() +
+        "/viewer.html";
   }
 
   std::vector<RenderViewHost*> GetMatchingViews(const std::string& url_query) {

chrome/browser/extensions/window_open_apitest.cc

@@ -21,10 +21,12 @@
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.h"
+#include "content/public/common/url_constants.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/extension_host.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/process_manager.h"
+#include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/switches.h"
 #include "net/dns/mock_host_resolver.h"
@@ -451,8 +453,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenExtension) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
 
-  GURL start_url(std::string("chrome-extension://") +
-      last_loaded_extension_id() + "/test.html");
+  GURL start_url(std::string(extensions::kExtensionScheme) +
+                     content::kStandardSchemeSeparator +
+                     last_loaded_extension_id() + "/test.html");
   ui_test_utils::NavigateToURL(browser(), start_url);
   WebContents* newtab = NULL;
   ASSERT_NO_FATAL_FAILURE(
@@ -471,8 +474,9 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenInvalidExtension) {
   ASSERT_TRUE(LoadExtension(
       test_data_dir_.AppendASCII("uitest").AppendASCII("window_open")));
 
-  GURL start_url(std::string("chrome-extension://") +
-      last_loaded_extension_id() + "/test.html");
+  GURL start_url(std::string(extensions::kExtensionScheme) +
+                     content::kStandardSchemeSeparator +
+                     last_loaded_extension_id() + "/test.html");
   ui_test_utils::NavigateToURL(browser(), start_url);
   ASSERT_NO_FATAL_FAILURE(
       OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(),
@@ -494,8 +498,11 @@ IN_PROC_BROWSER_TEST_F(ExtensionBrowserTest, WindowOpenNoPrivileges) {
   WebContents* newtab = NULL;
   ASSERT_NO_FATAL_FAILURE(
       OpenWindow(browser()->tab_strip_model()->GetActiveWebContents(),
-      GURL(std::string("chrome-extension://") + last_loaded_extension_id() +
-          "/newtab.html"), false, &newtab));
+                 GURL(std::string(extensions::kExtensionScheme) +
+                     content::kStandardSchemeSeparator +
+                     last_loaded_extension_id() + "/newtab.html"),
+                 false,
+                 &newtab));
 
   // Extension API should succeed.
   bool result = false;

extensions/common/csp_validator.cc

@@ -9,6 +9,8 @@
 #include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
+#include "content/public/common/url_constants.h"
+#include "extensions/common/constants.h"
 
 namespace extensions {
 
@@ -71,7 +73,10 @@ bool HasOnlySecureTokens(base::StringTokenizer& tokenizer,
         StartsWithASCII(source, "http://localhost:", false) ||
         StartsWithASCII(source, "https://", true) ||
         StartsWithASCII(source, "chrome://", true) ||
-        StartsWithASCII(source, "chrome-extension://", true) ||
+        StartsWithASCII(source,
+                        std::string(extensions::kExtensionScheme) +
+                            content::kStandardSchemeSeparator,
+                        true) ||
         StartsWithASCII(source, "chrome-extension-resource:", true)) {
       continue;
     }