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() {

[mmenke, 2015/09/18 18:58:53]

Should probably modify this to return a scoped_ptr in this CL as well, if there
isn't too much additional fallout.

[Charlie Harrison, 2015/09/18 19:56:06]

Done.

   net::ProxyConfigServiceAndroid* config_service =
       static_cast<net::ProxyConfigServiceAndroid*>(
           net::ProxyService::CreateSystemProxyConfigService(
               BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO),
-              nullptr /* Ignored on Android */ ));
+              nullptr /* Ignored on Android */ ).release());
   config_service->set_exclude_pac_url(true);
   return config_service;
 }
 
 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(
@@ skipping 352 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