Get rid of the link time dependency between content and chrome through the geolocation code.

chrome/browser/geolocation/access_token_store_browsertest.cc

 // Copyright (c) 2011 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/browser/geolocation/access_token_store.h"
-
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/geolocation/chrome_access_token_store.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/browser/browser_thread.h"
 
 namespace {
 
 // The token store factory implementation expects to be used from any well-known
 // chrome thread other than UI. We could use any arbitrary thread; IO is
 // a good choice as this is the expected usage.
 const BrowserThread::ID kExpectedClientThreadId = BrowserThread::IO;
@@ skipping 19 matching lines @@
   const string16* token_to_expect_;
   const string16* token_to_set_;
 };
 
 void StartTestStepFromClientThread(
     scoped_refptr<AccessTokenStore>* store,
     CancelableRequestConsumerBase* consumer,
     AccessTokenStore::LoadAccessTokensCallbackType* callback) {
   ASSERT_TRUE(BrowserThread::CurrentlyOn(kExpectedClientThreadId));
   if (*store == NULL)
-    (*store) = NewChromePrefsAccessTokenStore();
+    (*store) = new ChromeAccessTokenStore();
   (*store)->LoadAccessTokens(consumer, callback);
 }
 
 struct TokenLoadClientForTest {
   void NotReachedCallback(AccessTokenStore::AccessTokenSet /*tokens*/) {
     NOTREACHED() << "This request should have been canceled before callback";
   }
 };
 
 void RunCancelTestInClientTread() {
   ASSERT_TRUE(BrowserThread::CurrentlyOn(kExpectedClientThreadId));
-  scoped_refptr<AccessTokenStore> store(NewChromePrefsAccessTokenStore());
+  scoped_refptr<AccessTokenStore> store(new ChromeAccessTokenStore());
   CancelableRequestConsumer consumer;
   TokenLoadClientForTest load_client;
 
   // Single request, canceled explicitly
   CancelableRequestProvider::Handle first_handle =
       store->LoadAccessTokens(&consumer, NewCallback(
           &load_client, &TokenLoadClientForTest::NotReachedCallback));
   EXPECT_TRUE(consumer.HasPendingRequests());
   // Test this handle is valid.
   consumer.GetClientData(store.get(), first_handle);
@@ skipping 39 matching lines @@
   AccessTokenStore::AccessTokenSet::const_iterator item =
       access_token_set.find(ref_url_);
   if (!token_to_expect_) {
     EXPECT_TRUE(item == access_token_set.end());
   } else {
     EXPECT_FALSE(item == access_token_set.end());
     EXPECT_EQ(*token_to_expect_, item->second);
   }
 
   if (token_to_set_) {
-    scoped_refptr<AccessTokenStore> store(
-        NewChromePrefsAccessTokenStore());
+    scoped_refptr<AccessTokenStore> store(new ChromeAccessTokenStore());
     store->SaveAccessToken(ref_url_, *token_to_set_);
   }
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE, new MessageLoop::QuitTask);
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationAccessTokenStoreTest, SetAcrossInstances) {
   const string16 ref_token1 = ASCIIToUTF16("jksdfo90,'s#\"#1*(");
   const string16 ref_token2 = ASCIIToUTF16("\1\2\3\4\5\6\7\10\11\12=023");
   ASSERT_TRUE(BrowserThread::CurrentlyOn(BrowserThread::UI));
@@ skipping 12 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(GeolocationAccessTokenStoreTest, CancelRequest) {
   BrowserThread::PostTask(
       kExpectedClientThreadId, FROM_HERE, NewRunnableFunction(
           RunCancelTestInClientTread));
   ui_test_utils::RunMessageLoop();
 }
 
 }  // namespace