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

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: Removed logging and fixed MaybeBypassProxyAndPrepareToRetry 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 369 matching lines...) Expand 10 before | Expand all | Expand 10 after
380 #endif 380 #endif
381 381
382 params->profile = profile; 382 params->profile = profile;
383 params->prerender_tracker = g_browser_process->prerender_tracker(); 383 params->prerender_tracker = g_browser_process->prerender_tracker();
384 profile_params_.reset(params.release()); 384 profile_params_.reset(params.release());
385 385
386 ChromeNetworkDelegate::InitializePrefsOnUIThread( 386 ChromeNetworkDelegate::InitializePrefsOnUIThread(
387 &enable_referrers_, 387 &enable_referrers_,
388 &enable_do_not_track_, 388 &enable_do_not_track_,
389 &force_safesearch_, 389 &force_safesearch_,
390 &spdy_proxy_auth_enabled_,
390 pref_service); 391 pref_service);
391 392
392 scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy = 393 scoped_refptr<base::MessageLoopProxy> io_message_loop_proxy =
393 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO); 394 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO);
394 #if defined(ENABLE_PRINTING) 395 #if defined(ENABLE_PRINTING)
395 printing_enabled_.Init(prefs::kPrintingEnabled, pref_service); 396 printing_enabled_.Init(prefs::kPrintingEnabled, pref_service);
396 printing_enabled_.MoveToThread(io_message_loop_proxy); 397 printing_enabled_.MoveToThread(io_message_loop_proxy);
397 #endif 398 #endif
398 399
399 chrome_http_user_agent_settings_.reset( 400 chrome_http_user_agent_settings_.reset(
(...skipping 605 matching lines...) Expand 10 before | Expand all | Expand 10 after
1005 network_delegate->set_extension_info_map( 1006 network_delegate->set_extension_info_map(
1006 profile_params_->extension_info_map.get()); 1007 profile_params_->extension_info_map.get());
1007 #if defined(ENABLE_CONFIGURATION_POLICY) 1008 #if defined(ENABLE_CONFIGURATION_POLICY)
1008 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get()); 1009 network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());
1009 #endif 1010 #endif
1010 network_delegate->set_profile(profile_params_->profile); 1011 network_delegate->set_profile(profile_params_->profile);
1011 network_delegate->set_profile_path(profile_params_->path); 1012 network_delegate->set_profile_path(profile_params_->path);
1012 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get()); 1013 network_delegate->set_cookie_settings(profile_params_->cookie_settings.get());
1013 network_delegate->set_enable_do_not_track(&enable_do_not_track_); 1014 network_delegate->set_enable_do_not_track(&enable_do_not_track_);
1014 network_delegate->set_force_google_safe_search(&force_safesearch_); 1015 network_delegate->set_force_google_safe_search(&force_safesearch_);
1016 network_delegate->set_data_reduction_proxy_enabled(&spdy_proxy_auth_enabled_);
1015 network_delegate->set_prerender_tracker(profile_params_->prerender_tracker); 1017 network_delegate->set_prerender_tracker(profile_params_->prerender_tracker);
1016 network_delegate_.reset(network_delegate); 1018 network_delegate_.reset(network_delegate);
1017 1019
1018 fraudulent_certificate_reporter_.reset( 1020 fraudulent_certificate_reporter_.reset(
1019 new chrome_browser_net::ChromeFraudulentCertificateReporter( 1021 new chrome_browser_net::ChromeFraudulentCertificateReporter(
1020 main_request_context_.get())); 1022 main_request_context_.get()));
1021 1023
1022 // NOTE: Proxy service uses the default io thread network delegate, not the 1024 // NOTE: Proxy service uses the default io thread network delegate, not the
1023 // delegate just created. 1025 // delegate just created.
1024 proxy_service_.reset( 1026 proxy_service_.reset(
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1165 signin_names_->ReleaseResourcesOnUIThread(); 1167 signin_names_->ReleaseResourcesOnUIThread();
1166 1168
1167 google_services_user_account_id_.Destroy(); 1169 google_services_user_account_id_.Destroy();
1168 google_services_username_.Destroy(); 1170 google_services_username_.Destroy();
1169 google_services_username_pattern_.Destroy(); 1171 google_services_username_pattern_.Destroy();
1170 reverse_autologin_enabled_.Destroy(); 1172 reverse_autologin_enabled_.Destroy();
1171 one_click_signin_rejected_email_list_.Destroy(); 1173 one_click_signin_rejected_email_list_.Destroy();
1172 enable_referrers_.Destroy(); 1174 enable_referrers_.Destroy();
1173 enable_do_not_track_.Destroy(); 1175 enable_do_not_track_.Destroy();
1174 force_safesearch_.Destroy(); 1176 force_safesearch_.Destroy();
1177 spdy_proxy_auth_enabled_.Destroy();
1175 #if !defined(OS_CHROMEOS) 1178 #if !defined(OS_CHROMEOS)
1176 enable_metrics_.Destroy(); 1179 enable_metrics_.Destroy();
1177 #endif 1180 #endif
1178 safe_browsing_enabled_.Destroy(); 1181 safe_browsing_enabled_.Destroy();
1179 data_reduction_proxy_enabled_.Destroy(); 1182 data_reduction_proxy_enabled_.Destroy();
1180 printing_enabled_.Destroy(); 1183 printing_enabled_.Destroy();
1181 sync_disabled_.Destroy(); 1184 sync_disabled_.Destroy();
1182 signin_allowed_.Destroy(); 1185 signin_allowed_.Destroy();
1183 // TODO(bnc): remove per https://crbug.com/334602. 1186 // TODO(bnc): remove per https://crbug.com/334602.
1184 network_prediction_enabled_.Destroy(); 1187 network_prediction_enabled_.Destroy();
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
1251 void ProfileIOData::SetCookieSettingsForTesting( 1254 void ProfileIOData::SetCookieSettingsForTesting(
1252 CookieSettings* cookie_settings) { 1255 CookieSettings* cookie_settings) {
1253 DCHECK(!cookie_settings_.get()); 1256 DCHECK(!cookie_settings_.get());
1254 cookie_settings_ = cookie_settings; 1257 cookie_settings_ = cookie_settings;
1255 } 1258 }
1256 1259
1257 void ProfileIOData::set_signin_names_for_testing( 1260 void ProfileIOData::set_signin_names_for_testing(
1258 SigninNamesOnIOThread* signin_names) { 1261 SigninNamesOnIOThread* signin_names) {
1259 signin_names_.reset(signin_names); 1262 signin_names_.reset(signin_names);
1260 } 1263 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698