Revert 88400 (Probable breaker of XP Tests(dbg)(5), 10.6 Tests (dbg)(2), 10.5 Tests (dbg)(2))

chrome/browser/web_resource/web_resource_service.cc

 // Copyright (c) 2011 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.
 
 #include "chrome/browser/web_resource/web_resource_service.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sync/sync_ui_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/web_resource/web_resource_unpacker.h"
 #include "content/browser/browser_thread.h"
 #include "content/common/notification_service.h"
 #include "content/common/url_fetcher.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request_status.h"
@@ skipping 32 matching lines @@
     std::string web_resource_server =
         web_resource_service_->web_resource_server_;
     if (web_resource_service_->apply_locale_to_url_) {
       std::string locale = g_browser_process->GetApplicationLocale();
       web_resource_server.append(locale);
     }
 
     url_fetcher_.reset(new URLFetcher(GURL(
         web_resource_server),
         URLFetcher::GET, this));
-    // Use system request context and do not save state in cookies or cache.
+    // Do not let url fetcher affect existing state in profile (by setting
+    // cookies, for example.
     url_fetcher_->set_load_flags(net::LOAD_DISABLE_CACHE |
         net::LOAD_DO_NOT_SAVE_COOKIES);
     net::URLRequestContextGetter* url_request_context_getter =
-        g_browser_process->system_request_context();
+        web_resource_service_->profile_->GetRequestContext();
     url_fetcher_->set_request_context(url_request_context_getter);
     url_fetcher_->Start();
   }
 
   // From URLFetcher::Delegate.
   void OnURLFetchComplete(const URLFetcher* source,
                           const GURL& url,
                           const net::URLRequestStatus& status,
                           int response_code,
                           const net::ResponseCookies& cookies,
@@ skipping 104 matching lines @@
 
   // Holds raw JSON string.
   const std::string& json_data_;
 
   // True if we got a response from the utility process and have cleaned up
   // already.
   bool got_response_;
 };
 
 WebResourceService::WebResourceService(
+    Profile* profile,
     PrefService* prefs,
     const char* web_resource_server,
     bool apply_locale_to_url,
     NotificationType::Type notification_type,
     const char* last_update_time_pref_name,
     int start_fetch_delay,
     int cache_update_delay)
     : prefs_(prefs),
+      profile_(profile),
       ALLOW_THIS_IN_INITIALIZER_LIST(service_factory_(this)),
       in_fetch_(false),
       web_resource_server_(web_resource_server),
       apply_locale_to_url_(apply_locale_to_url),
       notification_type_(notification_type),
       last_update_time_pref_name_(last_update_time_pref_name),
       start_fetch_delay_(start_fetch_delay),
       cache_update_delay_(cache_update_delay),
       web_resource_update_scheduled_(false) {
   DCHECK(prefs);
+  DCHECK(profile);
   prefs_->RegisterStringPref(last_update_time_pref_name,
                              "0",
                              PrefService::UNSYNCABLE_PREF);
   resource_dispatcher_host_ = g_browser_process->resource_dispatcher_host();
   web_resource_fetcher_.reset(new WebResourceFetcher(this));
 }
 
 WebResourceService::~WebResourceService() { }
 
 void WebResourceService::PostNotification(int64 delay_ms) {
@@ skipping 52 matching lines @@
 }
 
 void WebResourceService::UpdateResourceCache(const std::string& json_data) {
   UnpackerClient* client = new UnpackerClient(this, json_data);
   client->Start();
 
   // Set cache update time in preferences.
   prefs_->SetString(last_update_time_pref_name_,
       base::DoubleToString(base::Time::Now().ToDoubleT()));
 }