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

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

Issue 10108026: Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA enabled. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: prefmember for metrics enabled Created 8 years, 8 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 "base/logging.h" 7 #include "base/logging.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/cookie_settings.h" 9 #include "chrome/browser/content_settings/cookie_settings.h"
10 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 10 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h" 11 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
12 #include "chrome/browser/extensions/api/proxy/proxy_api.h" 12 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
13 #include "chrome/browser/extensions/api/web_request/web_request_api.h" 13 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
14 #include "chrome/browser/extensions/extension_event_router_forwarder.h" 14 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
15 #include "chrome/browser/extensions/extension_info_map.h" 15 #include "chrome/browser/extensions/extension_info_map.h"
16 #include "chrome/browser/extensions/extension_process_manager.h" 16 #include "chrome/browser/extensions/extension_process_manager.h"
17 #include "chrome/browser/google/google_util.h"
18 #include "chrome/browser/metrics/metrics_service.h"
17 #include "chrome/browser/prefs/pref_member.h" 19 #include "chrome/browser/prefs/pref_member.h"
18 #include "chrome/browser/profiles/profile_manager.h" 20 #include "chrome/browser/profiles/profile_manager.h"
19 #include "chrome/browser/task_manager/task_manager.h" 21 #include "chrome/browser/task_manager/task_manager.h"
20 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
21 #include "content/public/browser/browser_thread.h" 23 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
23 #include "content/public/browser/resource_request_info.h" 25 #include "content/public/browser/resource_request_info.h"
24 #include "net/base/host_port_pair.h" 26 #include "net/base/host_port_pair.h"
25 #include "net/base/net_errors.h" 27 #include "net/base/net_errors.h"
26 #include "net/base/net_log.h" 28 #include "net/base/net_log.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 return; 98 return;
97 99
98 int process_id, render_view_id; 100 int process_id, render_view_id;
99 if (info->GetAssociatedRenderView(&process_id, &render_view_id)) { 101 if (info->GetAssociatedRenderView(&process_id, &render_view_id)) {
100 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, 102 BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
101 base::Bind(&NotifyEPMRequestStatus, 103 base::Bind(&NotifyEPMRequestStatus,
102 status, profile_id, process_id, render_view_id)); 104 status, profile_id, process_id, render_view_id));
103 } 105 }
104 } 106 }
105 107
108 // Prepare a PrefMember for ChromeNetworkDelegate's use by initializing it with
109 // a desired pref and moving it to the IO thread.
110 void InitializePrefMember(BooleanPrefMember* pref_member,
111 PrefService* pref_service,
112 const char* pref_name) {
113 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
114 pref_member->Init(pref_name, pref_service, NULL);
115 pref_member->MoveToThread(BrowserThread::IO);
116 }
117
106 } // namespace 118 } // namespace
107 119
108 ChromeNetworkDelegate::ChromeNetworkDelegate( 120 ChromeNetworkDelegate::ChromeNetworkDelegate(
109 ExtensionEventRouterForwarder* event_router, 121 ExtensionEventRouterForwarder* event_router,
110 ExtensionInfoMap* extension_info_map, 122 ExtensionInfoMap* extension_info_map,
111 const policy::URLBlacklistManager* url_blacklist_manager, 123 const policy::URLBlacklistManager* url_blacklist_manager,
112 void* profile, 124 void* profile,
113 CookieSettings* cookie_settings, 125 CookieSettings* cookie_settings,
114 BooleanPrefMember* enable_referrers) 126 BrowserVisibility visibility,
127 BooleanPrefMember* enable_referrers,
128 BooleanPrefMember* enable_metrics)
115 : event_router_(event_router), 129 : event_router_(event_router),
116 profile_(profile), 130 profile_(profile),
117 cookie_settings_(cookie_settings), 131 cookie_settings_(cookie_settings),
132 visibility_(visibility),
118 extension_info_map_(extension_info_map), 133 extension_info_map_(extension_info_map),
119 enable_referrers_(enable_referrers), 134 enable_referrers_(enable_referrers),
135 enable_metrics_(enable_metrics),
120 url_blacklist_manager_(url_blacklist_manager) { 136 url_blacklist_manager_(url_blacklist_manager) {
121 DCHECK(event_router); 137 DCHECK(event_router);
122 DCHECK(enable_referrers); 138 DCHECK(enable_referrers);
123 DCHECK(!profile || cookie_settings); 139 DCHECK(!profile || cookie_settings);
124 } 140 }
125 141
126 ChromeNetworkDelegate::~ChromeNetworkDelegate() {} 142 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
127 143
128 // static 144 // static
129 void ChromeNetworkDelegate::InitializeReferrersEnabled( 145 void ChromeNetworkDelegate::InitializeReferrersEnabled(
130 BooleanPrefMember* enable_referrers, 146 BooleanPrefMember* enable_referrers,
131 PrefService* pref_service) { 147 PrefService* pref_service) {
132 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); 148 InitializePrefMember(enable_referrers, pref_service, prefs::kEnableReferrers);
133 enable_referrers->Init(prefs::kEnableReferrers, pref_service, NULL); 149 }
134 enable_referrers->MoveToThread(BrowserThread::IO); 150
151 // static
152 void ChromeNetworkDelegate::InitializeMetricsEnabled(
153 BooleanPrefMember* enable_metrics,
154 PrefService* pref_service) {
155 InitializePrefMember(enable_metrics, pref_service,
156 prefs::kMetricsReportingEnabled);
135 } 157 }
136 158
137 int ChromeNetworkDelegate::OnBeforeURLRequest( 159 int ChromeNetworkDelegate::OnBeforeURLRequest(
138 net::URLRequest* request, 160 net::URLRequest* request,
139 const net::CompletionCallback& callback, 161 const net::CompletionCallback& callback,
140 GURL* new_url) { 162 GURL* new_url) {
141 #if defined(ENABLE_CONFIGURATION_POLICY) 163 #if defined(ENABLE_CONFIGURATION_POLICY)
142 // TODO(joaodasilva): This prevents extensions from seeing URLs that are 164 // TODO(joaodasilva): This prevents extensions from seeing URLs that are
143 // blocked. However, an extension might redirect the request to another URL, 165 // blocked. However, an extension might redirect the request to another URL,
144 // which is not blocked. 166 // which is not blocked.
(...skipping 13 matching lines...) Expand all
158 if (!enable_referrers_->GetValue()) 180 if (!enable_referrers_->GetValue())
159 request->set_referrer(std::string()); 181 request->set_referrer(std::string());
160 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest( 182 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
161 profile_, extension_info_map_.get(), request, callback, new_url); 183 profile_, extension_info_map_.get(), request, callback, new_url);
162 } 184 }
163 185
164 int ChromeNetworkDelegate::OnBeforeSendHeaders( 186 int ChromeNetworkDelegate::OnBeforeSendHeaders(
165 net::URLRequest* request, 187 net::URLRequest* request,
166 const net::CompletionCallback& callback, 188 const net::CompletionCallback& callback,
167 net::HttpRequestHeaders* headers) { 189 net::HttpRequestHeaders* headers) {
190 // Attach any applicable Chrome metrics headers. This is a best-effort attempt
191 // where failure will not cause OnBeforeSendHeaders to back out.
192 AddChromeMetricsStateHeader(request, headers);
193
168 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders( 194 return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
169 profile_, extension_info_map_.get(), request, callback, headers); 195 profile_, extension_info_map_.get(), request, callback, headers);
170 } 196 }
171 197
172 void ChromeNetworkDelegate::OnSendHeaders( 198 void ChromeNetworkDelegate::OnSendHeaders(
173 net::URLRequest* request, 199 net::URLRequest* request,
174 const net::HttpRequestHeaders& headers) { 200 const net::HttpRequestHeaders& headers) {
175 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders( 201 ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders(
176 profile_, extension_info_map_.get(), request, headers); 202 profile_, extension_info_map_.get(), request, headers);
177 } 203 }
(...skipping 119 matching lines...) Expand 10 before | Expand all | Expand 10 after
297 BrowserThread::PostTask( 323 BrowserThread::PostTask(
298 BrowserThread::UI, FROM_HERE, 324 BrowserThread::UI, FROM_HERE,
299 base::Bind(&TabSpecificContentSettings::CookieChanged, 325 base::Bind(&TabSpecificContentSettings::CookieChanged,
300 render_process_id, render_view_id, 326 render_process_id, render_view_id,
301 request->url(), request->first_party_for_cookies(), 327 request->url(), request->first_party_for_cookies(),
302 cookie_line, *options, !allow)); 328 cookie_line, *options, !allow));
303 } 329 }
304 330
305 return allow; 331 return allow;
306 } 332 }
333
334 void ChromeNetworkDelegate::AddChromeMetricsStateHeader(
335 net::URLRequest* request,
336 net::HttpRequestHeaders* headers) {
337 // Note our criteria for attaching Chrome experiment headers:
338 // 1. We only transmit to *.google.<TLD> domains. NOTE that this use of
339 // google_util helpers to check this does not guarantee that the URL is
340 // Google-owned, only that it is of the form *.google.<TLD>. In the future
341 // we may choose to reinforce this check.
342 // 2. We must verify that we are transmitting for a profile network context
343 // and not the system context. We do this by checking |profile_|, as it is
344 // NULL when we're in the system context.
345 // 3. We only transmit for non-Incognito profiles. Ensure that the pref has
346 // been passed in and is true.
347 // 4. For the X-Chrome-UMA-Enabled bit, we only set it if UMA is in fact
348 // enabled for this install of Chrome.
349 if (google_util::IsGoogleDomainUrl(request->url().spec(),
350 google_util::ALLOW_SUBDOMAIN) &&
351 profile_ && visibility_ == NORMAL && enable_metrics_ &&
352 enable_metrics_->GetValue()) {
353 headers->SetHeader("X-Chrome-UMA-Enabled", "1");
354 }
355 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698