Move some content url constants to /url.

chrome/browser/content_settings/local_shared_objects_container.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/content_settings/local_shared_objects_container.h"
 
 #include "chrome/browser/browsing_data/browsing_data_appcache_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_cookie_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_database_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_file_system_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_indexed_db_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_local_storage_helper.h"
 #include "chrome/browser/browsing_data/browsing_data_server_bound_cert_helper.h"
 #include "chrome/browser/browsing_data/cookies_tree_model.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
+#include "net/base/url_constants.h"
 #include "net/cookies/canonical_cookie.h"
 #include "url/gurl.h"
 
 namespace {
 
 bool SameDomainOrHost(const GURL& gurl1, const GURL& gurl2) {
   return net::registry_controlled_domains::SameDomainOrHost(
       gurl1,
       gurl2,
       net::registry_controlled_domains::INCLUDE_PRIVATE_REGISTRIES);
@@ skipping 63 matching lines @@
     for (net::CookieList::const_iterator cookie = cookie_list->begin();
          cookie != cookie_list->end();
          ++cookie) {
       // Strip leading '.'s.
       std::string cookie_domain = cookie->Domain();
       if (cookie_domain[0] == '.')
         cookie_domain = cookie_domain.substr(1);
       // The |domain_url| is only created in order to use the
       // SameDomainOrHost method below. It does not matter which scheme is
       // used as the scheme is ignored by the SameDomainOrHost method.
-      GURL domain_url(std::string(content::kHttpScheme) +
+      GURL domain_url(std::string(net::kHttpScheme) +
                       content::kStandardSchemeSeparator + cookie_domain);
       if (SameDomainOrHost(origin, domain_url))
         ++count;
     }
   }
 
   // Count local storages for the domain of the given |origin|.
   const std::set<GURL> local_storage_info =
       local_storages()->GetLocalStorageInfo();
   for (std::set<GURL>::const_iterator it = local_storage_info.begin();
@@ skipping 77 matching lines @@
       session_storages(),
       appcaches(),
       indexed_dbs(),
       file_systems(),
       NULL,
       server_bound_certs(),
       NULL);
 
   return make_scoped_ptr(new CookiesTreeModel(container, NULL, true));
 }