Use scoped_refptr for refcounted param in SafeBrowsingService.

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 328 matching lines @@
 
 SafeBrowsingService::~SafeBrowsingService() {
   // We should have already been shut down.  If we're still enabled, then the
   // database isn't going to be closed properly, which could lead to corruption.
   DCHECK(!enabled_);
 }
 
 void SafeBrowsingService::OnIOInitialize(
     const std::string& client_key,
     const std::string& wrapped_key,
     URLRequestContextGetter* request_context_getter) {

[lzheng, 2010/10/20 18:03:55]

Should this become scoped_refptr<URLRequestContextGetter>?

[willchan no longer on Chromium, 2010/10/20 18:06:49]

Not necessary, and there was a chromium-dev discussion where the majority of
people prefer that it is passed as a raw pointer.  The scoped_refptr is just to
make sure that the RunnableMethod task will have a Tuple that uses a
scoped_refptr, so the parameter will be guaranteed to be valid for the lifetime
of this function call.

It's sort of complicated.  Read the bug thread for details on the nature of the
bug.

   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   enabled_ = true;
   MakeDatabaseAvailable();
 
   // On Windows, get the safe browsing client name from the browser
   // distribution classes in installer util. These classes don't yet have
   // an analog on non-Windows builds so just keep the name specified here.
 #if defined(OS_WIN)
   BrowserDistribution* dist = BrowserDistribution::GetDistribution();
   std::string client_name(dist->GetSafeBrowsingName());
@@ skipping 19 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.
-  URLRequestContextGetter* request_context_getter =
+  scoped_refptr<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,
           request_context_getter));
 }
 
 void SafeBrowsingService::OnCloseDatabase() {
   DCHECK_EQ(MessageLoop::current(), safe_browsing_thread_->message_loop());
@@ skipping 141 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);
 }