| Index: chrome/utility/importer/ie_importer_win.cc
|
| diff --git a/chrome/utility/importer/ie_importer_win.cc b/chrome/utility/importer/ie_importer_win.cc
|
| index 540cf59ac981f5dfb36ae19840f80d9474dadbfa..4b5b8c2368576c9a29225813c302ba45c35d45aa 100644
|
| --- a/chrome/utility/importer/ie_importer_win.cc
|
| +++ b/chrome/utility/importer/ie_importer_win.cc
|
| @@ -40,6 +40,7 @@
|
| #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"
|
|
|
| @@ -468,10 +469,8 @@ void IEImporter::ImportFavorites() {
|
| }
|
|
|
| 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;
|
| @@ -602,8 +601,8 @@ void IEImporter::ImportPasswordsIE6() {
|
| 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;
|
| }
|
|
|
|
|