[Android] Return a dummy AccessTokenStore implementation from AwContentBrowserClient.

The reason is that GeolocationArbitrator doesn't expect access
token store to be NULL.

R=boilu@chromium.org


Review URL: https://chromiumcodereview.appspot.com/11343016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164707 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 22 insertions, 1 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index 84ab75b..634c135 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -12,6 +12,7 @@
 #include "android_webview/common/url_constants.h"
 #include "base/base_paths_android.h"
 #include "base/path_service.h"
+#include "content/public/browser/access_token_store.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ -19,6 +20,26 @@
 #include "grit/ui_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 
+namespace {
+
+class DummyAccessTokenStore : public content::AccessTokenStore {
+ public:
+  DummyAccessTokenStore() { }
+
+  virtual void LoadAccessTokens(
+      const LoadAccessTokensCallbackType& request) OVERRIDE { }
+
+ private:
+  virtual ~DummyAccessTokenStore() { }
+
+  virtual void SaveAccessToken(
+      const GURL& server_url, const string16& access_token) OVERRIDE { }
+
+  DISALLOW_COPY_AND_ASSIGN(DummyAccessTokenStore);
+};
+
+}
+
 namespace android_webview {
 
 AwContentBrowserClient::AwContentBrowserClient() {
@@ -240,7 +261,7 @@ net::NetLog* AwContentBrowserClient::GetNetLog() {
 
 content::AccessTokenStore* AwContentBrowserClient::CreateAccessTokenStore() {
   // TODO(boliu): Implement as part of geolocation code.
-  return NULL;
+  return new DummyAccessTokenStore();
 }
 
 bool AwContentBrowserClient::IsFastShutdownPossible() {