Rename some AccessToken types for readability.

* AccessTokenSet to AccessTokenMap (it is a map!)
* LoadAccessTokensCallbackType to LoadAccessTokensCallback

TBR=alokp,torne

Review URL: https://codereview.chromium.org/1705433002

Cr-Commit-Position: refs/heads/master@{#375937}

15 files changed, 56 insertions, 60 deletions

diff --git a/android_webview/browser/aw_content_browser_client.cc b/android_webview/browser/aw_content_browser_client.cc
index a3b2063..c0550b31 100644
--- a/android_webview/browser/aw_content_browser_client.cc
+++ b/android_webview/browser/aw_content_browser_client.cc
@@ -144,11 +144,11 @@ class AwAccessTokenStore : public content::AccessTokenStore {
   AwAccessTokenStore() { }
 
   // content::AccessTokenStore implementation
-  void LoadAccessTokens(const LoadAccessTokensCallbackType& request) override {
-    AccessTokenStore::AccessTokenSet access_token_set;
-    // AccessTokenSet and net::URLRequestContextGetter not used on Android,
+  void LoadAccessTokens(const LoadAccessTokensCallback& request) override {
+    AccessTokenStore::AccessTokenMap access_token_map;
+    // AccessTokenMap and net::URLRequestContextGetter not used on Android,
     // but Run needs to be called to finish the geolocation setup.
-    request.Run(access_token_set, NULL);
+    request.Run(access_token_map, NULL);
   }
   void SaveAccessToken(const GURL& server_url,
                        const base::string16& access_token) override {}
diff --git a/chrome/browser/geolocation/access_token_store_browsertest.cc b/chrome/browser/geolocation/access_token_store_browsertest.cc
index 803756e..eb4d011 100644
--- a/chrome/browser/geolocation/access_token_store_browsertest.cc
+++ b/chrome/browser/geolocation/access_token_store_browsertest.cc
@@ -36,7 +36,7 @@ class GeolocationAccessTokenStoreTest
       const base::string16* token_to_set);
 
   void OnAccessTokenStoresLoaded(
-      AccessTokenStore::AccessTokenSet access_token_set,
+      AccessTokenStore::AccessTokenMap access_token_map,
       net::URLRequestContextGetter* context_getter);
 
   scoped_refptr<AccessTokenStore> token_store_;
@@ -47,7 +47,7 @@ class GeolocationAccessTokenStoreTest
 
 void StartTestStepFromClientThread(
     scoped_refptr<AccessTokenStore>* store,
-    const AccessTokenStore::LoadAccessTokensCallbackType& callback) {
+    const AccessTokenStore::LoadAccessTokensCallback& callback) {
   ASSERT_TRUE(BrowserThread::CurrentlyOn(kExpectedClientThreadId));
   if (store->get() == NULL)
     (*store) = new ChromeAccessTokenStore();
@@ -55,7 +55,7 @@ void StartTestStepFromClientThread(
 }
 
 struct TokenLoadClientForTest {
-  void NotReachedCallback(AccessTokenStore::AccessTokenSet /*tokens*/,
+  void NotReachedCallback(AccessTokenStore::AccessTokenMap /*tokens*/,
                           net::URLRequestContextGetter* /*context_getter*/) {
     NOTREACHED() << "This request should have been canceled before callback";
   }
@@ -80,18 +80,18 @@ void GeolocationAccessTokenStoreTest::DoTestStepAndWaitForResults(
 }
 
 void GeolocationAccessTokenStoreTest::OnAccessTokenStoresLoaded(
-    AccessTokenStore::AccessTokenSet access_token_set,
+    AccessTokenStore::AccessTokenMap access_token_map,
     net::URLRequestContextGetter* context_getter) {
   ASSERT_TRUE(BrowserThread::CurrentlyOn(kExpectedClientThreadId))
       << "Callback from token factory should be from the same thread as the "
          "LoadAccessTokenStores request was made on";
   DCHECK(context_getter);
-  AccessTokenStore::AccessTokenSet::const_iterator item =
-      access_token_set.find(ref_url_);
+  AccessTokenStore::AccessTokenMap::const_iterator item =
+      access_token_map.find(ref_url_);
   if (!token_to_expect_) {
-    EXPECT_TRUE(item == access_token_set.end());
+    EXPECT_TRUE(item == access_token_map.end());
   } else {
-    EXPECT_FALSE(item == access_token_set.end());
+    EXPECT_FALSE(item == access_token_map.end());
     EXPECT_EQ(*token_to_expect_, item->second);
   }
 
diff --git a/chrome/browser/geolocation/chrome_access_token_store.cc b/chrome/browser/geolocation/chrome_access_token_store.cc
index 9cc2376..7e0e396 100644
--- a/chrome/browser/geolocation/chrome_access_token_store.cc
+++ b/chrome/browser/geolocation/chrome_access_token_store.cc
@@ -41,11 +41,9 @@ bool IsUnsupportedNetworkProviderUrl(const GURL& url) {
 // calls back to the originator on the originating thread.
 class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
  public:
-  TokenLoadingJob(
-      const AccessTokenStore::LoadAccessTokensCallbackType& callback)
-      : callback_(callback),
-        system_request_context_(NULL) {
-  }
+  explicit TokenLoadingJob(
+      const AccessTokenStore::LoadAccessTokensCallback& callback)
+      : callback_(callback), system_request_context_(NULL) {}
 
   void Run() {
     BrowserThread::PostTaskAndReply(
@@ -78,7 +76,7 @@ class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
           providers_to_remove.push_back(it.key());
           continue;
         }
-        it.value().GetAsString(&access_token_set_[url]);
+        it.value().GetAsString(&access_token_map_[url]);
       }
       for (size_t i = 0; i < providers_to_remove.size(); ++i) {
         token_dictionary->RemoveWithoutPathExpansion(
@@ -90,11 +88,11 @@ class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
   }
 
   void RespondOnOriginatingThread() {
-    callback_.Run(access_token_set_, system_request_context_);
+    callback_.Run(access_token_map_, system_request_context_);
   }
 
-  AccessTokenStore::LoadAccessTokensCallbackType callback_;
-  AccessTokenStore::AccessTokenSet access_token_set_;
+  AccessTokenStore::LoadAccessTokensCallback callback_;
+  AccessTokenStore::AccessTokenMap access_token_map_;
   net::URLRequestContextGetter* system_request_context_;
 };
 
@@ -107,7 +105,7 @@ void ChromeAccessTokenStore::RegisterPrefs(PrefRegistrySimple* registry) {
 ChromeAccessTokenStore::ChromeAccessTokenStore() {}
 
 void ChromeAccessTokenStore::LoadAccessTokens(
-    const LoadAccessTokensCallbackType& callback) {
+    const LoadAccessTokensCallback& callback) {
   scoped_refptr<TokenLoadingJob> job(new TokenLoadingJob(callback));
   job->Run();
 }
diff --git a/chrome/browser/geolocation/chrome_access_token_store.h b/chrome/browser/geolocation/chrome_access_token_store.h
index 8015c7e..be3f231 100644
--- a/chrome/browser/geolocation/chrome_access_token_store.h
+++ b/chrome/browser/geolocation/chrome_access_token_store.h
@@ -18,7 +18,7 @@ class ChromeAccessTokenStore : public content::AccessTokenStore {
 
   ChromeAccessTokenStore();
 
-  void LoadAccessTokens(const LoadAccessTokensCallbackType& request) override;
+  void LoadAccessTokens(const LoadAccessTokensCallback& request) override;
 
  private:
   ~ChromeAccessTokenStore() override;
diff --git a/chromecast/browser/geolocation/cast_access_token_store.cc b/chromecast/browser/geolocation/cast_access_token_store.cc
index 54624f2..32f944d 100644
--- a/chromecast/browser/geolocation/cast_access_token_store.cc
+++ b/chromecast/browser/geolocation/cast_access_token_store.cc
@@ -26,11 +26,11 @@ void CastAccessTokenStore::GetRequestContextGetterOnUIThread() {
 }
 
 void CastAccessTokenStore::RespondOnOriginatingThread() {
-  base::ResetAndReturn(&callback_).Run(access_token_set_, request_context_);
+  base::ResetAndReturn(&callback_).Run(access_token_map_, request_context_);
 }
 
 void CastAccessTokenStore::LoadAccessTokens(
-    const LoadAccessTokensCallbackType& callback) {
+    const LoadAccessTokensCallback& callback) {
   callback_ = callback;
   content::BrowserThread::PostTaskAndReply(
       content::BrowserThread::UI,
@@ -42,8 +42,8 @@ void CastAccessTokenStore::LoadAccessTokens(
 
 void CastAccessTokenStore::SaveAccessToken(
     const GURL& server_url, const base::string16& access_token) {
-  if (access_token_set_[server_url] != access_token) {
-    access_token_set_[server_url] = access_token;
+  if (access_token_map_[server_url] != access_token) {
+    access_token_map_[server_url] = access_token;
   }
 }
 
diff --git a/chromecast/browser/geolocation/cast_access_token_store.h b/chromecast/browser/geolocation/cast_access_token_store.h
index 27de8b3..8c576e2 100644
--- a/chromecast/browser/geolocation/cast_access_token_store.h
+++ b/chromecast/browser/geolocation/cast_access_token_store.h
@@ -25,7 +25,7 @@ class CastAccessTokenStore : public content::AccessTokenStore {
   ~CastAccessTokenStore() override;
 
   // AccessTokenStore implementation:
-  void LoadAccessTokens(const LoadAccessTokensCallbackType& callback) override;
+  void LoadAccessTokens(const LoadAccessTokensCallback& callback) override;
   void SaveAccessToken(
       const GURL& server_url, const base::string16& access_token) override;
 
@@ -34,8 +34,8 @@ class CastAccessTokenStore : public content::AccessTokenStore {
 
   content::BrowserContext* const browser_context_;
   net::URLRequestContextGetter* request_context_;
-  AccessTokenSet access_token_set_;
-  LoadAccessTokensCallbackType callback_;
+  AccessTokenMap access_token_map_;
+  LoadAccessTokensCallback callback_;
 
   DISALLOW_COPY_AND_ASSIGN(CastAccessTokenStore);
 };
diff --git a/content/browser/geolocation/fake_access_token_store.cc b/content/browser/geolocation/fake_access_token_store.cc
index 9e8704a..d7da9ad 100644
--- a/content/browser/geolocation/fake_access_token_store.cc
+++ b/content/browser/geolocation/fake_access_token_store.cc
@@ -33,11 +33,11 @@ void FakeAccessTokenStore::NotifyDelegateTokensLoaded() {
   }
 
   net::URLRequestContextGetter* context_getter = NULL;
-  callback_.Run(access_token_set_, context_getter);
+  callback_.Run(access_token_map_, context_getter);
 }
 
 void FakeAccessTokenStore::DefaultLoadAccessTokens(
-    const LoadAccessTokensCallbackType& callback) {
+    const LoadAccessTokensCallback& callback) {
   originating_task_runner_ = base::ThreadTaskRunnerHandle::Get().get();
   callback_ = callback;
 }
@@ -45,7 +45,7 @@ void FakeAccessTokenStore::DefaultLoadAccessTokens(
 void FakeAccessTokenStore::DefaultSaveAccessToken(
     const GURL& server_url, const base::string16& access_token) {
   DCHECK(server_url.is_valid());
-  access_token_set_[server_url] = access_token;
+  access_token_map_[server_url] = access_token;
 }
 
 FakeAccessTokenStore::~FakeAccessTokenStore() {}
diff --git a/content/browser/geolocation/fake_access_token_store.h b/content/browser/geolocation/fake_access_token_store.h
index b6b674d..49ce4cd 100644
--- a/content/browser/geolocation/fake_access_token_store.h
+++ b/content/browser/geolocation/fake_access_token_store.h
@@ -22,18 +22,18 @@ class FakeAccessTokenStore : public AccessTokenStore {
 
   // AccessTokenStore
   MOCK_METHOD1(LoadAccessTokens,
-               void(const LoadAccessTokensCallbackType& callback));
+               void(const LoadAccessTokensCallback& callback));
   MOCK_METHOD2(SaveAccessToken,
                void(const GURL& server_url,
                     const base::string16& access_token));
 
-  void DefaultLoadAccessTokens(const LoadAccessTokensCallbackType& callback);
+  void DefaultLoadAccessTokens(const LoadAccessTokensCallback& callback);
 
   void DefaultSaveAccessToken(const GURL& server_url,
                               const base::string16& access_token);
 
-  AccessTokenSet access_token_set_;
-  LoadAccessTokensCallbackType callback_;
+  AccessTokenMap access_token_map_;
+  LoadAccessTokensCallback callback_;
 
  protected:
   // Protected instead of private so we can have NiceMocks.
diff --git a/content/browser/geolocation/location_arbitrator_impl.cc b/content/browser/geolocation/location_arbitrator_impl.cc
index 5053504..e176dfe 100644
--- a/content/browser/geolocation/location_arbitrator_impl.cc
+++ b/content/browser/geolocation/location_arbitrator_impl.cc
@@ -93,7 +93,7 @@ void LocationArbitratorImpl::StopProviders() {
 }
 
 void LocationArbitratorImpl::OnAccessTokenStoresLoaded(
-    AccessTokenStore::AccessTokenSet access_token_set,
+    AccessTokenStore::AccessTokenMap access_token_map,
     net::URLRequestContextGetter* context_getter) {
   if (!is_running_ || !providers_.empty()) {
     // A second StartProviders() call may have arrived before the first
@@ -101,9 +101,9 @@ void LocationArbitratorImpl::OnAccessTokenStoresLoaded(
     return;
   }
   // If there are no access tokens, boot strap it with the default server URL.
-  if (access_token_set.empty())
-    access_token_set[DefaultNetworkProviderURL()];
-  for (const auto& entry : access_token_set) {
+  if (access_token_map.empty())
+    access_token_map[DefaultNetworkProviderURL()];
+  for (const auto& entry : access_token_map) {
     RegisterProvider(NewNetworkLocationProvider(
         GetAccessTokenStore(), context_getter, entry.first, entry.second));
   }
diff --git a/content/browser/geolocation/location_arbitrator_impl.h b/content/browser/geolocation/location_arbitrator_impl.h
index 65a5532..87ae11b 100644
--- a/content/browser/geolocation/location_arbitrator_impl.h
+++ b/content/browser/geolocation/location_arbitrator_impl.h
@@ -69,7 +69,7 @@ class CONTENT_EXPORT LocationArbitratorImpl : public LocationArbitrator {
   // |providers_| or deleted on error (e.g. it fails to start).
   void RegisterProvider(LocationProvider* provider);
   void OnAccessTokenStoresLoaded(
-      AccessTokenStore::AccessTokenSet access_token_store,
+      AccessTokenStore::AccessTokenMap access_token_map,
       net::URLRequestContextGetter* context_getter);
   void DoStartProviders();
 
diff --git a/content/browser/geolocation/location_arbitrator_impl_unittest.cc b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
index bd5eb6e..0ca94b5 100644
--- a/content/browser/geolocation/location_arbitrator_impl_unittest.cc
+++ b/content/browser/geolocation/location_arbitrator_impl_unittest.cc
@@ -173,8 +173,8 @@ TEST_F(GeolocationLocationArbitratorTest, NormalUsage) {
   EXPECT_FALSE(gps());
   arbitrator_->StartProviders(false);
 
-  EXPECT_TRUE(access_token_store_->access_token_set_.empty());
-  EXPECT_TRUE(access_token_store_->access_token_set_.empty());
+  EXPECT_TRUE(access_token_store_->access_token_map_.empty());
+  EXPECT_TRUE(access_token_store_->access_token_map_.empty());
 
   access_token_store_->NotifyDelegateTokensLoaded();
   ASSERT_TRUE(cell());
diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc
index 724eb35..0b09a39 100644
--- a/content/browser/geolocation/network_location_provider_unittest.cc
+++ b/content/browser/geolocation/network_location_provider_unittest.cc
@@ -126,7 +126,7 @@ class GeolocationNetworkProviderTest : public testing::Test {
         access_token_store_.get(),
         NULL,  // No URLContextGetter needed, as using test urlfecther factory.
         test_server_url_,
-        access_token_store_->access_token_set_[test_server_url_]);
+        access_token_store_->access_token_map_[test_server_url_]);
     if (set_permission_granted)
       provider->OnPermissionGranted();
     return provider;
@@ -415,7 +415,7 @@ TEST_F(GeolocationNetworkProviderTest, MultipleWifiScansComplete) {
 
   // Token should be in the store.
   EXPECT_EQ(base::UTF8ToUTF16(REFERENCE_ACCESS_TOKEN),
-            access_token_store_->access_token_set_[test_server_url_]);
+            access_token_store_->access_token_map_[test_server_url_]);
 
   // Wifi updated again, with one less AP. This is 'close enough' to the
   // previous scan, so no new request made.
@@ -508,7 +508,7 @@ TEST_F(GeolocationNetworkProviderTest, NetworkRequestDeferredForPermission) {
 
 TEST_F(GeolocationNetworkProviderTest,
        NetworkRequestWithWifiDataDeferredForPermission) {
-  access_token_store_->access_token_set_[test_server_url_] =
+  access_token_store_->access_token_map_[test_server_url_] =
       base::UTF8ToUTF16(REFERENCE_ACCESS_TOKEN);
   scoped_ptr<LocationProvider> provider(CreateProvider(false));
   EXPECT_TRUE(provider->StartProvider(false));
diff --git a/content/public/browser/access_token_store.h b/content/public/browser/access_token_store.h
index bd13014..bf1483a 100644
--- a/content/public/browser/access_token_store.h
+++ b/content/public/browser/access_token_store.h
@@ -33,18 +33,16 @@ namespace content {
 class AccessTokenStore : public base::RefCountedThreadSafe<AccessTokenStore> {
  public:
   // Map of server URLs to associated access token.
-  typedef std::map<GURL, base::string16> AccessTokenSet;
-  typedef base::Callback<void(AccessTokenSet, net::URLRequestContextGetter*)>
-      LoadAccessTokensCallbackType;
+  typedef std::map<GURL, base::string16> AccessTokenMap;
+  typedef base::Callback<void(AccessTokenMap, net::URLRequestContextGetter*)>
+      LoadAccessTokensCallback;
 
   // |callback| will be invoked once per LoadAccessTokens call, after existing
   // access tokens have been loaded from persistent store. As a convenience the
   // URLRequestContextGetter is also supplied as an argument in |callback|, as
   // in Chrome the call to obtain this must also be performed on the UI thread
   // so it is efficient to piggyback it onto this request.
-  // Takes ownership of |callback|.
-  virtual void LoadAccessTokens(
-      const LoadAccessTokensCallbackType& callback) = 0;
+  virtual void LoadAccessTokens(const LoadAccessTokensCallback& callback) = 0;
 
   virtual void SaveAccessToken(
       const GURL& server_url, const base::string16& access_token) = 0;
diff --git a/content/shell/browser/shell_access_token_store.cc b/content/shell/browser/shell_access_token_store.cc
index 9f8136e..956ae1a 100644
--- a/content/shell/browser/shell_access_token_store.cc
+++ b/content/shell/browser/shell_access_token_store.cc
@@ -22,7 +22,7 @@ ShellAccessTokenStore::~ShellAccessTokenStore() {
 }
 
 void ShellAccessTokenStore::LoadAccessTokens(
-    const LoadAccessTokensCallbackType& callback) {
+    const LoadAccessTokensCallback& callback) {
   BrowserThread::PostTaskAndReply(
       BrowserThread::UI,
       FROM_HERE,
@@ -40,12 +40,12 @@ void ShellAccessTokenStore::GetRequestContextOnUIThread(
 }
 
 void ShellAccessTokenStore::RespondOnOriginatingThread(
-    const LoadAccessTokensCallbackType& callback) {
+    const LoadAccessTokensCallback& callback) {
   // Since content_shell is a test executable, rather than an end user program,
   // we provide a dummy access_token set to avoid hitting the server.
-  AccessTokenSet access_token_set;
-  access_token_set[GURL()] = base::ASCIIToUTF16("chromium_content_shell");
-  callback.Run(access_token_set, system_request_context_.get());
+  AccessTokenMap access_token_map;
+  access_token_map[GURL()] = base::ASCIIToUTF16("chromium_content_shell");
+  callback.Run(access_token_map, system_request_context_.get());
   system_request_context_ = NULL;
 }
 
diff --git a/content/shell/browser/shell_access_token_store.h b/content/shell/browser/shell_access_token_store.h
index 7bae25f..7d8fc8e 100644
--- a/content/shell/browser/shell_access_token_store.h
+++ b/content/shell/browser/shell_access_token_store.h
@@ -24,10 +24,10 @@ class ShellAccessTokenStore : public content::AccessTokenStore {
 
   void GetRequestContextOnUIThread(
       content::ShellBrowserContext* shell_browser_context);
-  void RespondOnOriginatingThread(const LoadAccessTokensCallbackType& callback);
+  void RespondOnOriginatingThread(const LoadAccessTokensCallback& callback);
 
   // AccessTokenStore
-  void LoadAccessTokens(const LoadAccessTokensCallbackType& callback) override;
+  void LoadAccessTokens(const LoadAccessTokensCallback& callback) override;
 
   void SaveAccessToken(const GURL& server_url,
                        const base::string16& access_token) override;