| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index acf78736ba2af7ec65ac670c747f8f5c37c82198..3d5f319a6060919bd7ce8c81e6570e5b24da5e25 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -77,7 +77,6 @@
|
| #include "chrome/common/chrome_paths_internal.h"
|
| #include "chrome/common/chrome_switches.h"
|
| #include "chrome/common/chrome_version_info.h"
|
| -#include "chrome/common/net/url_fixer_upper.h"
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/url_constants.h"
|
| #include "components/bookmarks/browser/bookmark_model.h"
|
| @@ -86,6 +85,7 @@
|
| #include "components/metrics/metrics_service.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/startup_metric_utils/startup_metric_utils.h"
|
| +#include "components/url_fixer/url_fixer.h"
|
| #include "components/user_prefs/user_prefs.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/dom_storage_context.h"
|
| @@ -1275,7 +1275,8 @@ GURL ProfileImpl::GetHomePage() {
|
|
|
| base::FilePath browser_directory;
|
| PathService::Get(base::DIR_CURRENT, &browser_directory);
|
| - GURL home_page(URLFixerUpper::FixupRelativeFile(browser_directory,
|
| + GURL home_page(url_fixer::FixupRelativeFile(
|
| + browser_directory,
|
| command_line.GetSwitchValuePath(switches::kHomePage)));
|
| if (home_page.is_valid())
|
| return home_page;
|
| @@ -1283,9 +1284,8 @@ GURL ProfileImpl::GetHomePage() {
|
|
|
| if (GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage))
|
| return GURL(chrome::kChromeUINewTabURL);
|
| - GURL home_page(URLFixerUpper::FixupURL(
|
| - GetPrefs()->GetString(prefs::kHomePage),
|
| - std::string()));
|
| + GURL home_page(url_fixer::FixupURL(GetPrefs()->GetString(prefs::kHomePage),
|
| + std::string()));
|
| if (!home_page.is_valid())
|
| return GURL(chrome::kChromeUINewTabURL);
|
| return home_page;
|
|
|