make ProxyService::CreateSystemProxyConfigService return scoped_ptrs

android_webview/browser/aw_browser_context.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 "android_webview/browser/aw_browser_context.h"
 
 #include "android_webview/browser/aw_browser_policy_connector.h"
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/browser/aw_permission_manager.h"
 #include "android_webview/browser/aw_pref_store.h"
@@ skipping 45 matching lines @@
 void DeleteDirRecursively(const base::FilePath& path) {
   if (!base::DeleteFile(path, true)) {
     // Deleting a non-existent file is considered successful, so this will
     // trigger only in case of real errors.
     LOG(WARNING) << "Failed to delete " << path.AsUTF8Unsafe();
   }
 }
 
 AwBrowserContext* g_browser_context = NULL;
 
-net::ProxyConfigService* CreateProxyConfigService() {
-  net::ProxyConfigServiceAndroid* config_service =
-      static_cast<net::ProxyConfigServiceAndroid*>(
-          net::ProxyService::CreateSystemProxyConfigService(
-              BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
-              nullptr /* Ignored on Android */ ));
-  config_service->set_exclude_pac_url(true);
-  return config_service;
+scoped_ptr<net::ProxyConfigService> CreateProxyConfigService() {
+  scoped_ptr<net::ProxyConfigService> config_service =
+      net::ProxyService::CreateSystemProxyConfigService(
+          BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
+          nullptr /* Ignored on Android */);
+
+  // TODO(csharrison) Architect the wrapper better so we don't need a cast for
+  // android ProxyConfigServices.
+  net::ProxyConfigServiceAndroid* android_config_service =
+      static_cast<net::ProxyConfigServiceAndroid*>(config_service.get());
+  android_config_service->set_exclude_pac_url(true);
+  return config_service.Pass();
 }
 
 bool OverrideBlacklistForURL(const GURL& url, bool* block, int* reason) {
   // We don't have URLs that should never be blacklisted here.
   return false;
 }
 
 policy::URLBlacklistManager* CreateURLBlackListManager(
     PrefService* pref_service) {
   policy::URLBlacklist::SegmentURLCallback segment_url_callback =
@@ skipping 86 matching lines @@
     // Delay the legacy dir removal to not impact startup performance.
     BrowserThread::PostDelayedTask(
         BrowserThread::FILE, FROM_HERE,
         base::Bind(&DeleteDirRecursively, fallback_cache_dir),
         base::TimeDelta::FromMilliseconds(legacy_cache_removal_delay_ms_));
   } else {
     cache_path = fallback_cache_dir;
     LOG(WARNING) << "Failed to get cache directory for Android WebView. "
                  << "Using app data directory as a fallback.";
   }
-  url_request_context_getter_ =
-      new AwURLRequestContextGetter(
-          cache_path, cookie_store_.get(),
-          make_scoped_ptr(CreateProxyConfigService()).Pass());
+  url_request_context_getter_ = new AwURLRequestContextGetter(
+      cache_path, cookie_store_.get(), CreateProxyConfigService());
 
   data_reduction_proxy_io_data_.reset(
       new data_reduction_proxy::DataReductionProxyIOData(
           data_reduction_proxy::Client::WEBVIEW_ANDROID,
           data_reduction_proxy::DataReductionProxyParams::kAllowed,
           url_request_context_getter_->GetNetLog(),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
           BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
           false /* enable */,
           false /* enable_quic */,
@@ skipping 240 matching lines @@
     return;
   // We don't care about commit_delay for now. It is just a dummy value.
   base::TimeDelta commit_delay = base::TimeDelta::FromMinutes(60);
   data_reduction_proxy_service->EnableCompressionStatisticsLogging(
       user_pref_service_.get(),
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
       commit_delay);
 }
 
 }  // namespace android_webview