Move some content url constants to /url.

chrome/utility/importer/ie_importer_win.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/utility/importer/ie_importer_win.h"
 
 #include <ole2.h>
 #include <intshcut.h>
 #include <shlobj.h>
 #include <urlhist.h>
@@ skipping 22 matching lines @@
 #include "chrome/common/importer/imported_bookmark_entry.h"
 #include "chrome/common/importer/imported_favicon_usage.h"
 #include "chrome/common/importer/importer_bridge.h"
 #include "chrome/common/importer/importer_data_types.h"
 #include "chrome/common/importer/importer_url_row.h"
 #include "chrome/common/importer/pstore_declarations.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/utility/importer/favicon_reencode.h"
 #include "components/autofill/core/common/password_form.h"
 #include "grit/generated_resources.h"
+#include "net/base/url_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 namespace {
 
 // Registry key paths from which we import IE settings.
 const base::char16 kSearchScopePath[] =
   L"Software\\Microsoft\\Internet Explorer\\SearchScopes";
 const base::char16 kIEVersionKey[] =
   L"Software\\Microsoft\\Internet Explorer";
@@ skipping 408 matching lines @@
   if (!bookmarks.empty() && !cancelled()) {
     const base::string16& first_folder_name =
         l10n_util::GetStringUTF16(IDS_BOOKMARK_GROUP_FROM_IE);
     bridge_->AddBookmarks(bookmarks, first_folder_name);
   }
   if (!favicons.empty() && !cancelled())
     bridge_->SetFavicons(favicons);
 }
 
 void IEImporter::ImportHistory() {
-  const std::string kSchemes[] = {content::kHttpScheme,
-                                  content::kHttpsScheme,
-                                  content::kFtpScheme,
-                                  content::kFileScheme};
+  const std::string kSchemes[] = {net::kHttpScheme, net::kHttpsScheme,
+                                  content::kFtpScheme, content::kFileScheme};
   int total_schemes = arraysize(kSchemes);
 
   base::win::ScopedComPtr<IUrlHistoryStg2> url_history_stg2;
   HRESULT result;
   result = url_history_stg2.CreateInstance(CLSID_CUrlHistory, NULL,
                                            CLSCTX_INPROC_SERVER);
   if (FAILED(result))
     return;
   base::win::ScopedComPtr<IEnumSTATURL> enum_url;
   if (SUCCEEDED(result = url_history_stg2->EnumUrls(enum_url.Receive()))) {
@@ skipping 110 matching lines @@
   item.Release();
   pstore.Release();
   FreeLibrary(pstorec_dll);
 
   size_t i;
   for (i = 0; i < ac_list.size(); i++) {
     if (!ac_list[i].is_url || ac_list[i].data.size() < 2)
       continue;
 
     GURL url(ac_list[i].key.c_str());
-    if (!(LowerCaseEqualsASCII(url.scheme(), content::kHttpScheme) ||
-        LowerCaseEqualsASCII(url.scheme(), content::kHttpsScheme))) {
+    if (!(LowerCaseEqualsASCII(url.scheme(), net::kHttpScheme) ||
+          LowerCaseEqualsASCII(url.scheme(), net::kHttpsScheme))) {
       continue;
     }
 
     autofill::PasswordForm form;
     GURL::Replacements rp;
     rp.ClearUsername();
     rp.ClearPassword();
     rp.ClearQuery();
     rp.ClearRef();
     form.origin = url.ReplaceComponents(rp);
@@ skipping 255 matching lines @@
   static int version = -1;
   if (version < 0) {
     wchar_t buffer[128];
     DWORD buffer_length = sizeof(buffer);
     base::win::RegKey reg_key(HKEY_LOCAL_MACHINE, kIEVersionKey, KEY_READ);
     LONG result = reg_key.ReadValue(L"Version", buffer, &buffer_length, NULL);
     version = ((result == ERROR_SUCCESS)? _wtoi(buffer) : 0);
   }
   return version;
 }