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

Side by Side Diff: chrome/browser/net/chrome_network_delegate.cc

Issue 1117613003: [chrome/browser/net] favor DCHECK_CURRENTLY_ON for better logs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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/net/chrome_network_delegate.h" 5 #include "chrome/browser/net/chrome_network_delegate.h"
6 6
7 #include <stdlib.h> 7 #include <stdlib.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 int rv) { 104 int rv) {
105 if (rv == net::OK && new_url->is_empty()) 105 if (rv == net::OK && new_url->is_empty())
106 safe_search_util::ForceGoogleSafeSearch(request, new_url); 106 safe_search_util::ForceGoogleSafeSearch(request, new_url);
107 callback.Run(rv); 107 callback.Run(rv);
108 } 108 }
109 109
110 #if defined(OS_ANDROID) 110 #if defined(OS_ANDROID)
111 void RecordPrecacheStatsOnUIThread(const GURL& url, 111 void RecordPrecacheStatsOnUIThread(const GURL& url,
112 const base::Time& fetch_time, int64 size, 112 const base::Time& fetch_time, int64 size,
113 bool was_cached, void* profile_id) { 113 bool was_cached, void* profile_id) {
114 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 114 DCHECK_CURRENTLY_ON(BrowserThread::UI);
115 115
116 Profile* profile = reinterpret_cast<Profile*>(profile_id); 116 Profile* profile = reinterpret_cast<Profile*>(profile_id);
117 if (!g_browser_process->profile_manager()->IsValidProfile(profile)) { 117 if (!g_browser_process->profile_manager()->IsValidProfile(profile)) {
118 return; 118 return;
119 } 119 }
120 120
121 precache::PrecacheManager* precache_manager = 121 precache::PrecacheManager* precache_manager =
122 precache::PrecacheManagerFactory::GetForBrowserContext(profile); 122 precache::PrecacheManagerFactory::GetForBrowserContext(profile);
123 if (!precache_manager || !precache_manager->IsPrecachingAllowed()) { 123 if (!precache_manager || !precache_manager->IsPrecachingAllowed()) {
124 // |precache_manager| could be NULL if the profile is off the record. 124 // |precache_manager| could be NULL if the profile is off the record.
(...skipping 204 matching lines...) Expand 10 before | Expand all | Expand 10 after
329 } 329 }
330 #endif 330 #endif
331 331
332 // static 332 // static
333 void ChromeNetworkDelegate::InitializePrefsOnUIThread( 333 void ChromeNetworkDelegate::InitializePrefsOnUIThread(
334 BooleanPrefMember* enable_referrers, 334 BooleanPrefMember* enable_referrers,
335 BooleanPrefMember* enable_do_not_track, 335 BooleanPrefMember* enable_do_not_track,
336 BooleanPrefMember* force_google_safe_search, 336 BooleanPrefMember* force_google_safe_search,
337 BooleanPrefMember* force_youtube_safety_mode, 337 BooleanPrefMember* force_youtube_safety_mode,
338 PrefService* pref_service) { 338 PrefService* pref_service) {
339 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 339 DCHECK_CURRENTLY_ON(BrowserThread::UI);
340 enable_referrers->Init(prefs::kEnableReferrers, pref_service); 340 enable_referrers->Init(prefs::kEnableReferrers, pref_service);
341 enable_referrers->MoveToThread( 341 enable_referrers->MoveToThread(
342 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 342 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
343 if (enable_do_not_track) { 343 if (enable_do_not_track) {
344 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service); 344 enable_do_not_track->Init(prefs::kEnableDoNotTrack, pref_service);
345 enable_do_not_track->MoveToThread( 345 enable_do_not_track->MoveToThread(
346 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO)); 346 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
347 } 347 }
348 if (force_google_safe_search) { 348 if (force_google_safe_search) {
349 force_google_safe_search->Init(prefs::kForceGoogleSafeSearch, pref_service); 349 force_google_safe_search->Init(prefs::kForceGoogleSafeSearch, pref_service);
(...skipping 327 matching lines...) Expand 10 before | Expand all | Expand 10 after
677 return experimental_web_platform_features_enabled_; 677 return experimental_web_platform_features_enabled_;
678 } 678 }
679 679
680 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader( 680 bool ChromeNetworkDelegate::OnCancelURLRequestWithPolicyViolatingReferrerHeader(
681 const net::URLRequest& request, 681 const net::URLRequest& request,
682 const GURL& target_url, 682 const GURL& target_url,
683 const GURL& referrer_url) const { 683 const GURL& referrer_url) const {
684 ReportInvalidReferrerSend(target_url, referrer_url); 684 ReportInvalidReferrerSend(target_url, referrer_url);
685 return true; 685 return true;
686 } 686 }
OLDNEW
« no previous file with comments | « chrome/browser/net/chrome_http_user_agent_settings.cc ('k') | chrome/browser/net/chrome_url_request_context_getter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698