Coalesce more hardcoded schemes to using predefined constants.

chrome/browser/extensions/extension.cc

 // Copyright (c) 2006-2008 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/browser/extensions/extension.h"
 
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "chrome/common/extensions/user_script.h"
-
-const char kExtensionURLScheme[] = "chrome-extension";
-const char kUserScriptURLScheme[] = "chrome-user-script";
+#include "chrome/common/url_constants.h"
 
 const char Extension::kManifestFilename[] = "manifest.json";
 
 const wchar_t* Extension::kContentScriptsKey = L"content_scripts";
 const wchar_t* Extension::kDescriptionKey = L"description";
 const wchar_t* Extension::kFormatVersionKey = L"format_version";
 const wchar_t* Extension::kIdKey = L"id";
 const wchar_t* Extension::kJsKey = L"js";
 const wchar_t* Extension::kMatchesKey = L"matches";
 const wchar_t* Extension::kNameKey = L"name";
@@ skipping 43 matching lines @@
     "Required value 'version' is missing or invalid.";
 const char* Extension::kInvalidZipHashError =
     "Required key 'zip_hash' is missing or invalid.";
 const char* Extension::kInvalidPluginsDirError =
     "Invalid value for 'plugins_dir'.";
 
 const std::string Extension::VersionString() const {
   return version_->GetString();
 }
 
-// Defined in extension_protocols.h.
-extern const char kExtensionURLScheme[];
-
 // static
 GURL Extension::GetResourceURL(const GURL& extension_url,
                                const std::string& relative_path) {
-  DCHECK(extension_url.SchemeIs(kExtensionURLScheme));
+  DCHECK(extension_url.SchemeIs(chrome::kExtensionScheme));
   DCHECK(extension_url.path() == "/");
 
   GURL ret_val = GURL(extension_url.spec() + relative_path);
   DCHECK(StartsWithASCII(ret_val.spec(), extension_url.spec(), false));
 
   return ret_val;
 }
 
 // static
 FilePath Extension::GetResourcePath(const FilePath& extension_path,
@@ skipping 93 matching lines @@
   FilePath id_path;
   id_path = id_path.AppendASCII(id_);
   if ((id_path.value() == FilePath::kCurrentDirectory) ||
       (id_path.value() == FilePath::kParentDirectory) ||
       !(id_path.BaseName() == id_path)) {
     *error = kInvalidIdError;
     return false;
   }
 
   // Initialize URL.
-  extension_url_ = GURL(std::string(kExtensionURLScheme) + "://" + id_ + "/");
+  extension_url_ = GURL(std::string(chrome::kExtensionScheme) +
+                        chrome::kStandardSchemeSeparator + id_ + "/");
 
   // Initialize version.
   std::string version_str;
   if (!source.GetString(kVersionKey, &version_str)) {
     *error = kInvalidVersionError;
     return false;
   }
   version_.reset(Version::GetVersionFromString(version_str));
   if (!version_.get()) {
     *error = kInvalidVersionError;
@@ skipping 119 matching lines @@
       script.set_path(Extension::GetResourcePath(path(), file));
       script.set_url(Extension::GetResourceURL(url(), file));
 
       content_scripts_.push_back(script);
     }
   }
 
   return true;
 }