Revert 61899 for breaking cookes on file:// URLs....

chrome/browser/safe_browsing/safe_browsing_service.cc

 // Copyright (c) 2010 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/safe_browsing/safe_browsing_service.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/path_service.h"
@@ skipping 368 matching lines @@
 
   protocol_manager_ = new SafeBrowsingProtocolManager(this,
                                                       client_name,
                                                       client_key,
                                                       wrapped_key,
                                                       request_context_getter,
                                                       info_url_prefix,
                                                       mackey_url_prefix,
                                                       disable_auto_update);
 
+  // Balance the reference added by Start().
+  request_context_getter->Release();
+
   protocol_manager_->Initialize();
 }
 
 void SafeBrowsingService::OnIOShutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (!enabled_)
     return;
 
   enabled_ = false;
 
@@ skipping 239 matching lines @@
   PrefService* local_state = g_browser_process->local_state();
   std::string client_key, wrapped_key;
   if (local_state) {
     client_key =
       local_state->GetString(prefs::kSafeBrowsingClientKey);
     wrapped_key =
       local_state->GetString(prefs::kSafeBrowsingWrappedKey);
   }
 
   // We will issue network fetches using the default profile's request context.
-  scoped_refptr<URLRequestContextGetter> request_context_getter =
+  URLRequestContextGetter* request_context_getter =
       GetDefaultProfile()->GetRequestContext();
+  request_context_getter->AddRef();  // Balanced in OnIOInitialize.
 
   BrowserThread::PostTask(
       BrowserThread::IO, FROM_HERE,
       NewRunnableMethod(
-          this,
-          &SafeBrowsingService::OnIOInitialize,
-          client_key,
-          wrapped_key,
+          this, &SafeBrowsingService::OnIOInitialize, client_key, wrapped_key,
           request_context_getter));
 }
 
 void SafeBrowsingService::OnCloseDatabase() {
   DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
   DCHECK(closing_database_);
 
   // Because |closing_database_| is true, nothing on the IO thread will be
   // accessing the database, so it's safe to delete and then NULL the pointer.
   delete database_;
@@ skipping 136 matching lines @@
   if (!enabled_)
     return;
 
   DLOG(INFO) << "ReportSafeBrowsingHit: " << malicious_url << " " << page_url
              << " " << referrer_url << " " << is_subresource
              << " " << threat_type;
   protocol_manager_->ReportSafeBrowsingHit(malicious_url, page_url,
                                            referrer_url, is_subresource,
                                            threat_type);
 }