Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/browser/profiles/profile_io_data.cc

Issue 390533003: Bypassed Bytes UMAs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: "Addressed bengr comments" Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/profiles/profile_io_data.h" 5 #include "chrome/browser/profiles/profile_io_data.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/basictypes.h" 9 #include "base/basictypes.h"
10 #include "base/bind.h" 10 #include "base/bind.h"
(...skipping 366 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 #endif 377 #endif
378 378
379 params->profile = profile; 379 params->profile = profile;
380 params->prerender_tracker = g_browser_process->prerender_tracker(); 380 params->prerender_tracker = g_browser_process->prerender_tracker();
381 profile_params_.reset(params.release()); 381 profile_params_.reset(params.release());
382 382
383 ChromeNetworkDelegate::InitializePrefsOnUIThread( 383 ChromeNetworkDelegate::InitializePrefsOnUIThread(
384 &enable_referrers_, 384 &enable_referrers_,
385 &enable_do_not_track_, 385 &enable_do_not_track_,
386 &force_safesearch_, 386 &force_safesearch_,
387 &spdy_proxy_auth_enabled_,
387 pref_service); 388 pref_service);
388 389
389 scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy = 390 scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy =
390 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 391 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
391 #if defined(ENABLE_PRINTING) 392 #if defined(ENABLE_PRINTING)
392 printing_enabled_.Init(prefs::kPrintingEnabled, pref_service); 393 printing_enabled_.Init(prefs::kPrintingEnabled, pref_service);
393 printing_enabled_.MoveToThread(io_message_loop_proxy); 394 printing_enabled_.MoveToThread(io_message_loop_proxy);
394 #endif 395 #endif
395 396
396 chrome_http_user_agent_settings_.reset( 397 chrome_http_user_agent_settings_.reset(
(...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after
1000 network_delegate->set_extension_info_map( 1001 network_delegate->set_extension_info_map(
1001 profile_params_->extension_info_map.get()); 1002 profile_params_->extension_info_map.get());
1002 #if defined(ENABLE_CONFIGURATION_POLICY) 1003 #if defined(ENABLE_CONFIGURATION_POLICY)
1003 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); 1004 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());
1004 #endif 1005 #endif
1005 network_delegate->set_profile(profile_params_->profile); 1006 network_delegate->set_profile(profile_params_->profile);
1006 network_delegate->set_profile_path(profile_params_->path); 1007 network_delegate->set_profile_path(profile_params_->path);
1007 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); 1008 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
1008 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 1009 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
1009 network_delegate->set_force_google_safe_search(&force_safesearch_); 1010 network_delegate->set_force_google_safe_search(&force_safesearch_);
1011 network_delegate->set_data_reduction_proxy_enabled(&spdy_proxy_auth_enabled_);
1010 network_delegate->set_prerender_tracker(profile_params_->prerender_tracker); 1012 network_delegate->set_prerender_tracker(profile_params_->prerender_tracker);
1011 network_delegate_.reset(network_delegate); 1013 network_delegate_.reset(network_delegate);
1012 1014
1013 fraudulent_certificate_reporter_.reset( 1015 fraudulent_certificate_reporter_.reset(
1014 new chrome_browser_net::ChromeFraudulentCertificateReporter( 1016 new chrome_browser_net::ChromeFraudulentCertificateReporter(
1015 main_request_context_.get())); 1017 main_request_context_.get()));
1016 1018
1017 // NOTE: Proxy service uses the default io thread network delegate, not the 1019 // NOTE: Proxy service uses the default io thread network delegate, not the
1018 // delegate just created. 1020 // delegate just created.
1019 proxy_service_.reset( 1021 proxy_service_.reset(
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1160 signin_names_->ReleaseResourcesOnUIThread(); 1162 signin_names_->ReleaseResourcesOnUIThread();
1161 1163
1162 google_services_user_account_id_.Destroy(); 1164 google_services_user_account_id_.Destroy();
1163 google_services_username_.Destroy(); 1165 google_services_username_.Destroy();
1164 google_services_username_pattern_.Destroy(); 1166 google_services_username_pattern_.Destroy();
1165 reverse_autologin_enabled_.Destroy(); 1167 reverse_autologin_enabled_.Destroy();
1166 one_click_signin_rejected_email_list_.Destroy(); 1168 one_click_signin_rejected_email_list_.Destroy();
1167 enable_referrers_.Destroy(); 1169 enable_referrers_.Destroy();
1168 enable_do_not_track_.Destroy(); 1170 enable_do_not_track_.Destroy();
1169 force_safesearch_.Destroy(); 1171 force_safesearch_.Destroy();
1172 spdy_proxy_auth_enabled_.Destroy();
1170 #if !defined(OS_CHROMEOS) 1173 #if !defined(OS_CHROMEOS)
1171 enable_metrics_.Destroy(); 1174 enable_metrics_.Destroy();
1172 #endif 1175 #endif
1173 safe_browsing_enabled_.Destroy(); 1176 safe_browsing_enabled_.Destroy();
1174 data_reduction_proxy_enabled_.Destroy(); 1177 data_reduction_proxy_enabled_.Destroy();
1175 printing_enabled_.Destroy(); 1178 printing_enabled_.Destroy();
1176 sync_disabled_.Destroy(); 1179 sync_disabled_.Destroy();
1177 signin_allowed_.Destroy(); 1180 signin_allowed_.Destroy();
1178 // TODO(bnc): remove per https://crbug.com/334602. 1181 // TODO(bnc): remove per https://crbug.com/334602.
1179 network_prediction_enabled_.Destroy(); 1182 network_prediction_enabled_.Destroy();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
1246 void ProfileIOData::SetCookieSettingsForTesting( 1249 void ProfileIOData::SetCookieSettingsForTesting(
1247 CookieSettings* cookie_settings) { 1250 CookieSettings* cookie_settings) {
1248 DCHECK(!cookie_settings_.get()); 1251 DCHECK(!cookie_settings_.get());
1249 cookie_settings_ = cookie_settings; 1252 cookie_settings_ = cookie_settings;
1250 } 1253 }
1251 1254
1252 void ProfileIOData::set_signin_names_for_testing( 1255 void ProfileIOData::set_signin_names_for_testing(
1253 SigninNamesOnIOThread* signin_names) { 1256 SigninNamesOnIOThread* signin_names) {
1254 signin_names_.reset(signin_names); 1257 signin_names_.reset(signin_names);
1255 } 1258 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698