Move some content url constants to /url.

chrome/browser/browsing_data/cookies_tree_model.cc

 // Copyright (c) 2012 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/browsing_data/cookies_tree_model.h"
 
 #include <algorithm>
 #include <functional>
 #include <vector>
 
@@ skipping 54 matching lines @@
 
 std::string CanonicalizeHost(const GURL& url) {
   // The canonicalized representation makes the registry controlled domain
   // come first, and then adds subdomains in reverse order, e.g.
   // 1.mail.google.com would become google.com.mail.1, and then a standard
   // string comparison works to order hosts by registry controlled domain
   // first. Leading dots are ignored, ".google.com" is the same as
   // "google.com".
 
   if (url.SchemeIsFile()) {
-    return std::string(content::kFileScheme) +
+    return std::string(url::kFileScheme) +
            content::kStandardSchemeSeparator;
   }
 
   std::string host = url.host();
   std::string retval =
       net::registry_controlled_domains::GetDomainAndRegistry(
           host,
           net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
   if (!retval.length())  // Is an IP address or other special origin.
     return host;
@@ skipping 466 matching lines @@
 CookieTreeNode::DetailedInfo CookieTreeRootNode::GetDetailedInfo() const {
   return DetailedInfo().Init(DetailedInfo::TYPE_ROOT);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // CookieTreeHostNode, public:
 
 // static
 base::string16 CookieTreeHostNode::TitleForUrl(const GURL& url) {
   const std::string file_origin_node_name(
-      std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
+      std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
   return base::UTF8ToUTF16(url.SchemeIsFile() ? file_origin_node_name
                                               : url.host());
 }
 
 CookieTreeHostNode::CookieTreeHostNode(const GURL& url)
     : CookieTreeNode(TitleForUrl(url)),
       cookies_child_(NULL),
       databases_child_(NULL),
       local_storages_child_(NULL),
       session_storages_child_(NULL),
       appcaches_child_(NULL),
       indexed_dbs_child_(NULL),
       file_systems_child_(NULL),
       quota_child_(NULL),
       server_bound_certs_child_(NULL),
       flash_lso_child_(NULL),
       url_(url),
       canonicalized_host_(CanonicalizeHost(url)) {}
 
 CookieTreeHostNode::~CookieTreeHostNode() {}
 
 const std::string CookieTreeHostNode::GetHost() const {
   const std::string file_origin_node_name(
-      std::string(content::kFileScheme) + content::kStandardSchemeSeparator);
+      std::string(url::kFileScheme) + content::kStandardSchemeSeparator);
   return url_.SchemeIsFile() ? file_origin_node_name : url_.host();
 }
 
 CookieTreeNode::DetailedInfo CookieTreeHostNode::GetDetailedInfo() const {
   return DetailedInfo().InitHost();
 }
 
 CookieTreeCookiesNode* CookieTreeHostNode::GetOrCreateCookiesNode() {
   if (cookies_child_)
     return cookies_child_;
@@ skipping 738 matching lines @@
 
 void CookiesTreeModel::NotifyObserverEndBatch() {
   // Only notify the observers if this is the outermost call to EndBatch() if
   // called in a nested manner.
   if (--batch_update_ == 0) {
     FOR_EACH_OBSERVER(Observer,
                       cookies_observer_list_,
                       TreeModelEndBatch(this));
   }
 }