Move some content url constants to /url.

chrome/browser/autocomplete/autocomplete_provider.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/autocomplete/autocomplete_provider.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/autocomplete_provider_listener.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/net/url_fixer_upper.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/common/url_constants.h"
 #include "net/base/net_util.h"
+#include "net/base/url_constants.h"
 #include "url/gurl.h"
 
 // static
 const size_t AutocompleteProvider::kMaxMatches = 3;
 
 AutocompleteProvider::AutocompleteProvider(
     AutocompleteProviderListener* listener,
     Profile* profile,
     Type type)
     : profile_(profile),
@@ skipping 174 matching lines @@
   input->UpdateText(output, base::string16::npos, parts);
   return !output.empty();
 }
 
 // static
 size_t AutocompleteProvider::TrimHttpPrefix(base::string16* url) {
   // Find any "http:".
   if (!AutocompleteInput::HasHTTPScheme(*url))
     return 0;
   size_t scheme_pos =
-      url->find(base::ASCIIToUTF16(content::kHttpScheme) + base::char16(':'));
+      url->find(base::ASCIIToUTF16(net::kHttpScheme) + base::char16(':'));
   DCHECK_NE(base::string16::npos, scheme_pos);
 
   // Erase scheme plus up to two slashes.
-  size_t prefix_end = scheme_pos + strlen(content::kHttpScheme) + 1;
+  size_t prefix_end = scheme_pos + strlen(net::kHttpScheme) + 1;
   const size_t after_slashes = std::min(url->length(), prefix_end + 2);
   while ((prefix_end < after_slashes) && ((*url)[prefix_end] == '/'))
     ++prefix_end;
   url->erase(scheme_pos, prefix_end - scheme_pos);
   return (scheme_pos == 0) ? prefix_end : 0;
 }