| Index: chrome/browser/profiles/profile_io_data.cc
|
| diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
|
| index c73a21c24ab52d31bf6176b4c4de3e55ce716d96..71a413722f42b3ca1971b343557211872d85be4a 100644
|
| --- a/chrome/browser/profiles/profile_io_data.cc
|
| +++ b/chrome/browser/profiles/profile_io_data.cc
|
| @@ -194,7 +194,7 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
|
| pref_service);
|
|
|
| #if defined(ENABLE_PRINTING)
|
| - printing_enabled_.Init(prefs::kPrintingEnabled, pref_service, NULL);
|
| + printing_enabled_.Init(prefs::kPrintingEnabled, pref_service);
|
| printing_enabled_.MoveToThread(
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
|
| #endif
|
| @@ -206,23 +206,23 @@ void ProfileIOData::InitializeOnUIThread(Profile* profile) {
|
| if (!is_incognito()) {
|
| signin_names_.reset(new SigninNamesOnIOThread());
|
|
|
| - google_services_username_.Init(prefs::kGoogleServicesUsername, pref_service,
|
| - NULL);
|
| + google_services_username_.Init(prefs::kGoogleServicesUsername,
|
| + pref_service);
|
| google_services_username_.MoveToThread(
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
|
|
|
| google_services_username_pattern_.Init(
|
| - prefs::kGoogleServicesUsernamePattern, local_state_pref_service, NULL);
|
| + prefs::kGoogleServicesUsernamePattern, local_state_pref_service);
|
| google_services_username_pattern_.MoveToThread(
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
|
|
|
| reverse_autologin_enabled_.Init(
|
| - prefs::kReverseAutologinEnabled, pref_service, NULL);
|
| + prefs::kReverseAutologinEnabled, pref_service);
|
| reverse_autologin_enabled_.MoveToThread(
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
|
|
|
| one_click_signin_rejected_email_list_.Init(
|
| - prefs::kReverseAutologinRejectedEmailList, pref_service, NULL);
|
| + prefs::kReverseAutologinRejectedEmailList, pref_service);
|
| one_click_signin_rejected_email_list_.MoveToThread(
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
|
| }
|
| @@ -457,8 +457,7 @@ void ProfileIOData::InitializeMetricsEnabledStateOnUIThread() {
|
| // Prep the PrefMember and send it to the IO thread, since this value will be
|
| // read from there.
|
| enable_metrics_.Init(prefs::kMetricsReportingEnabled,
|
| - g_browser_process->local_state(),
|
| - NULL);
|
| + g_browser_process->local_state());
|
| enable_metrics_.MoveToThread(
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
|
| #endif // defined(OS_CHROMEOS)
|
|
|