Geolocation cleanup: corrects uses of content::AccessTokenStore* and net::URLRequestContextGetter*

android_webview/browser/aw_content_browser_client.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_content_browser_client.h"
 
 #include <utility>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
@@ skipping 148 matching lines @@
   ~AwAccessTokenStore() override {}
 
   DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
 // A provider of Geolocation services to override AccessTokenStore.
 class AwGeolocationDelegate : public content::GeolocationDelegate {
  public:
   AwGeolocationDelegate() = default;
 
-  content::AccessTokenStore* CreateAccessTokenStore() final {
+  scoped_refptr<content::AccessTokenStore> CreateAccessTokenStore() final {
     return new AwAccessTokenStore();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AwGeolocationDelegate);
 };
 
 AwLocaleManager* g_locale_manager = NULL;
 
 }  // anonymous namespace
@@ skipping 372 matching lines @@
 
 #if defined(VIDEO_HOLE)
 content::ExternalVideoSurfaceContainer*
 AwContentBrowserClient::OverrideCreateExternalVideoSurfaceContainer(
     content::WebContents* web_contents) {
   return native_factory_->CreateExternalVideoSurfaceContainer(web_contents);
 }
 #endif
 
 }  // namespace android_webview