Provide mutable members of UrlRequestContext via pure-virtual interface

chrome/browser/safe_browsing/safe_browsing_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.
 
 #include "chrome/browser/safe_browsing/safe_browsing_service.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 82 matching lines @@
   DCHECK(result);
   return path.Append(chrome::kSafeBrowsingBaseFilename);
 }
 
 FilePath CookieFilePath() {
   return FilePath(BaseFilename().value() + kCookiesFile);
 }
 
 }  // namespace
 
-// Custom URLRequestContext used by SafeBrowsing requests, which are not
-// associated with a particular profile. We need to use a subclass of
-// URLRequestContext in order to provide the correct User-Agent.
-class SafeBrowsingURLRequestContext : public net::URLRequestContext {
- public:
-  virtual const std::string& GetUserAgent(
-      const GURL& url) const OVERRIDE {
-    return content::GetUserAgent(url);
-  }
-
- private:
-  virtual ~SafeBrowsingURLRequestContext() {}
-
-  base::debug::LeakTracker<SafeBrowsingURLRequestContext> leak_tracker_;
-};
-
 class SafeBrowsingURLRequestContextGetter
     : public net::URLRequestContextGetter {
  public:
   explicit SafeBrowsingURLRequestContextGetter(
       SafeBrowsingService* sb_service_);
 
   // Implementation for net::UrlRequestContextGetter.
   virtual net::URLRequestContext* GetURLRequestContext() OVERRIDE;
   virtual scoped_refptr<base::SingleThreadTaskRunner>
       GetNetworkTaskRunner() const OVERRIDE;
@@ skipping 486 matching lines @@
 
 void SafeBrowsingService::InitURLRequestContextOnIOThread(
     net::URLRequestContextGetter* system_url_request_context_getter) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   DCHECK(!url_request_context_.get());
 
   scoped_refptr<net::CookieStore> cookie_store = new net::CookieMonster(
       new SQLitePersistentCookieStore(CookieFilePath(), false, NULL),
       NULL);
 
-  url_request_context_.reset(new SafeBrowsingURLRequestContext);
+  url_request_context_.reset(new net::URLRequestContext);
   // |system_url_request_context_getter| may be NULL during tests.
   if (system_url_request_context_getter)
     url_request_context_->CopyFrom(
         system_url_request_context_getter->GetURLRequestContext());

[mmenke, 2012/10/05 20:08:51]

While you're here, mind adding braces to this if statement?

   url_request_context_->set_cookie_store(cookie_store);
 }
 
 void SafeBrowsingService::DestroyURLRequestContextOnIOThread() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
 
   url_request_context_->AssertNoURLRequests();
 
   // Need to do the CheckForLeaks on IOThread instead of in ShutDown where
   // url_request_context_getter_ is cleared,  since the URLRequestContextGetter
@@ skipping 804 matching lines @@
     Stop();
 
   if (csd_service_.get())
     csd_service_->SetEnabledAndRefreshState(enable);
   if (download_service_.get()) {
     download_service_->SetEnabled(
         enable && !CommandLine::ForCurrentProcess()->HasSwitch(
             switches::kDisableImprovedDownloadProtection));
   }
 }