diff options
Diffstat (limited to 'chrome/browser/profiles')
-rw-r--r-- | chrome/browser/profiles/profile_impl.cc | 8 | ||||
-rw-r--r-- | chrome/browser/profiles/profile_io_data.cc | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc index c18b3a8..1e7fa4b 100644 --- a/chrome/browser/profiles/profile_impl.cc +++ b/chrome/browser/profiles/profile_impl.cc @@ -90,7 +90,7 @@ #include "components/pref_registry/pref_registry_syncable.h" #include "components/signin/core/browser/signin_manager.h" #include "components/ui/zoom/zoom_event_manager.h" -#include "components/url_formatter/url_fixer.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" @@ -1207,7 +1207,7 @@ GURL ProfileImpl::GetHomePage() { base::FilePath browser_directory; PathService::Get(base::DIR_CURRENT, &browser_directory); - GURL home_page(url_formatter::FixupRelativeFile( + GURL home_page(url_fixer::FixupRelativeFile( browser_directory, command_line.GetSwitchValuePath(switches::kHomePage))); if (home_page.is_valid()) @@ -1216,8 +1216,8 @@ GURL ProfileImpl::GetHomePage() { if (GetPrefs()->GetBoolean(prefs::kHomePageIsNewTabPage)) return GURL(chrome::kChromeUINewTabURL); - GURL home_page(url_formatter::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; diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc index b0f4b94..a149387 100644 --- a/chrome/browser/profiles/profile_io_data.cc +++ b/chrome/browser/profiles/profile_io_data.cc @@ -58,7 +58,7 @@ #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h" #include "components/dom_distiller/core/url_constants.h" #include "components/sync_driver/pref_names.h" -#include "components/url_formatter/url_fixer.h" +#include "components/url_fixer/url_fixer.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/host_zoom_map.h" #include "content/public/browser/notification_service.h" @@ -508,7 +508,7 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) { #if defined(ENABLE_CONFIGURATION_POLICY) policy::URLBlacklist::SegmentURLCallback callback = static_cast<policy::URLBlacklist::SegmentURLCallback>( - url_formatter::SegmentURL); + url_fixer::SegmentURL); base::SequencedWorkerPool* pool = BrowserThread::GetBlockingPool(); scoped_refptr<base::SequencedTaskRunner> background_task_runner = pool->GetSequencedTaskRunner(pool->GetSequenceToken()); |