Geolocation: change GeolocationDelegate to injected by content/

content/shell/browser/shell_content_browser_client.cc

 // Copyright 2013 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 "content/shell/browser/shell_content_browser_client.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/base_switches.h"
@@ skipping 104 matching lines @@
     return crash_handler->GetDeathSignalSocket();
   }
 
   return -1;
 }
 #endif  // defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
 
 // A provider of services for Geolocation.
 class ShellGeolocationDelegate : public content::GeolocationDelegate {
  public:
-  explicit ShellGeolocationDelegate(ShellBrowserContext* context)
-      : context_(context) {}
+  using GetShellBrowserContextCB = base::Callback<ShellBrowserContext*(void)>;
+  explicit ShellGeolocationDelegate(GetShellBrowserContextCB get_context_cb)
+      : get_context_cb_(get_context_cb) {}
 
   scoped_refptr<AccessTokenStore> CreateAccessTokenStore() final {
-    return new ShellAccessTokenStore(context_);
+    return new ShellAccessTokenStore(get_context_cb_.Run());
   }
 
  private:
-  ShellBrowserContext* context_;
+  GetShellBrowserContextCB get_context_cb_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellGeolocationDelegate);
 };
 
 }  // namespace
 
 ShellContentBrowserClient* ShellContentBrowserClient::Get() {
   return g_browser_client;
 }
 
@@ skipping 220 matching lines @@
 ShellBrowserContext* ShellContentBrowserClient::browser_context() {
   return shell_browser_main_parts_->browser_context();
 }
 
 ShellBrowserContext*
     ShellContentBrowserClient::off_the_record_browser_context() {
   return shell_browser_main_parts_->off_the_record_browser_context();
 }
 
 GeolocationDelegate* ShellContentBrowserClient::CreateGeolocationDelegate() {
-  return new ShellGeolocationDelegate(browser_context());
+  return new ShellGeolocationDelegate(base::Bind(
+      &ShellContentBrowserClient::browser_context, base::Unretained(this)));

[Ken Rockot(use gerrit already), 2016/07/20 20:47:04]

This is pretty weird. Why not just get rid of the ShellGeolocationDelegate
constructor arg altogether and have CreateAccessTokenStore call
ShellGeolocationDelegate::Get()->browser_context()

[mcasas, 2016/07/20 20:53:14]

Indeed why not! Done.

 }
 
 }  // namespace content