Implementing geolocation for the Android Webview

android_webview/browser/aw_content_browser_client.cc

Index: android_webview/browser/aw_content_browser_client.cc
diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 5a53dd1cb0f381f96c5b860ad44640bf7912af37..14d3694038cdd7c15840d5006305cc4545dd7918 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -23,20 +23,25 @@
 
 namespace {
 
-class DummyAccessTokenStore : public content::AccessTokenStore {
+class AwAccessTokenStore : public content::AccessTokenStore {
  public:
-  DummyAccessTokenStore() { }
+  AwAccessTokenStore() { }
 
+  // content::AccessTokenStore implementation
   virtual void LoadAccessTokens(
-      const LoadAccessTokensCallbackType& request) OVERRIDE { }
-
- private:
-  virtual ~DummyAccessTokenStore() { }
-
+      const LoadAccessTokensCallbackType& request) OVERRIDE {
+    AccessTokenStore::AccessTokenSet access_token_set;
+    // AccessTokenSet and net::URLRequestContextGetter not used on Android,
+    // but Run needs to be called to finish the geolocation setup.
+    request.Run(access_token_set, NULL);
+  }
   virtual void SaveAccessToken(
       const GURL& server_url, const string16& access_token) OVERRIDE { }
 
-  DISALLOW_COPY_AND_ASSIGN(DummyAccessTokenStore);
+ private:
+  virtual ~AwAccessTokenStore() { }
+
+  DISALLOW_COPY_AND_ASSIGN(AwAccessTokenStore);
 };
 
 }
@@ -273,7 +278,7 @@ net::NetLog* AwContentBrowserClient::GetNetLog() {
 
 content::AccessTokenStore* AwContentBrowserClient::CreateAccessTokenStore() {
   // TODO(boliu): Implement as part of geolocation code.
-  return new DummyAccessTokenStore();
+  return new AwAccessTokenStore();
 }
 
 bool AwContentBrowserClient::IsFastShutdownPossible() {