Do cookie checks in NetworkDelegate instead of the URLRequest::Delegate.

chrome/browser/metrics/metrics_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 //------------------------------------------------------------------------------
 // Description of the life cycle of a instance of MetricsService.
 //
 //  OVERVIEW
 //
 // A MetricsService instance is typically created at application startup.  It
@@ skipping 163 matching lines @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/guid.h"
 #include "chrome/common/metrics/metrics_log_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
 #include "content/browser/load_notification_details.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
+#include "content/public/common/content_url_request_user_data.h"
 #include "content/public/common/url_fetcher.h"
 #include "net/base/load_flags.h"
 #include "webkit/plugins/webplugininfo.h"
 
 // TODO(port): port browser_distribution.h.
 #if !defined(OS_POSIX)
 #include "chrome/installer/util/browser_distribution.h"
 #endif
 
 #if defined(OS_CHROMEOS)
@@ skipping 890 matching lines @@
   DCHECK(!log_manager_.staged_log_text().empty());
 
   // Prepare the XML version.
   DCHECK(!current_fetch_xml_.get());
   current_fetch_xml_.reset(content::URLFetcher::Create(
       GURL(server_url_xml_), content::URLFetcher::POST, this));
   current_fetch_xml_->SetRequestContext(
       g_browser_process->system_request_context());
   current_fetch_xml_->SetUploadData(kMetricsTypeXml,
                                     log_manager_.staged_log_text().xml);
+  // No user data, as the request will be cookie-less.
+  current_fetch_xml_->SetContentURLRequestUserData(
+      new content::ContentURLRequestUserData());
   // We already drop cookies server-side, but we might as well strip them out
   // client-side as well.
   current_fetch_xml_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                    net::LOAD_DO_NOT_SEND_COOKIES);
 
   // Prepare the protobuf version.
   DCHECK(!current_fetch_proto_.get());
   if (log_manager_.has_staged_log_proto()) {
     current_fetch_proto_.reset(content::URLFetcher::Create(
         GURL(server_url_proto_), content::URLFetcher::POST, this));
     current_fetch_proto_->SetRequestContext(
         g_browser_process->system_request_context());
     current_fetch_proto_->SetUploadData(kMetricsTypeProto,
                                         log_manager_.staged_log_text().proto);
+    // No user data, as the request will be cookie-less.
+    current_fetch_proto_->SetContentURLRequestUserData(
+        new content::ContentURLRequestUserData());
     // We already drop cookies server-side, but we might as well strip them out
     // client-side as well.
     current_fetch_proto_->SetLoadFlags(net::LOAD_DO_NOT_SAVE_COOKIES |
                                        net::LOAD_DO_NOT_SEND_COOKIES);
 
     // Discard the protobuf version of the staged log, so that we will avoid
     // re-uploading it even if we need to re-upload the XML version.
     // TODO(isherman): Handle protobuf upload failures more gracefully once we
     // transition away from the XML-based pipeline.
     log_manager_.DiscardStagedLogProto();
@@ skipping 533 matching lines @@
   if (local_state) {
     const PrefService::Preference* uma_pref =
         local_state->FindPreference(prefs::kMetricsReportingEnabled);
     if (uma_pref) {
       bool success = uma_pref->GetValue()->GetAsBoolean(&result);
       DCHECK(success);
     }
   }
   return result;
 }