Reapply geolocation network protocol changes.

chrome/browser/geolocation/chrome_access_token_store.cc

 // Copyright (c) 2012 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 "chrome/browser/geolocation/chrome_access_token_store.h"
 
 #include "base/bind.h"
 #include "base/string_piece.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "googleurl/src/gurl.h"
 
 using content::AccessTokenStore;
 using content::BrowserThread;
 
 namespace {
 
-// This was the default location service url for Chrome versions 14 and earlier
-// but is no longer supported.
-const char* kOldDefaultNetworkProviderUrl = "https://www.google.com/loc/json";
+bool IsUnsupportedNetworkProviderUrl(const GURL& url) {
+  const std::string& spec = url.spec();
+
+  // Unsupported after Chrome v14.
+  if (spec == "https://www.google.com/loc/json")
+    return true;
+
+  // Unsupported after Chrome v22.
+  if (spec == "https://maps.googleapis.com/maps/api/browserlocation/json")
+    return true;
+
+  return false;
+}
 
 // Loads access tokens and other necessary data on the UI thread, and
 // calls back to the originator on the originating threaad.
 class TokenLoadingJob : public base::RefCountedThreadSafe<TokenLoadingJob> {
  public:
   TokenLoadingJob(
       const AccessTokenStore::LoadAccessTokensCallbackType& callback)
       : callback_(callback),
         system_request_context_(NULL) {
   }
@@ skipping 10 matching lines @@
   friend class base::RefCountedThreadSafe<TokenLoadingJob>;
 
   ~TokenLoadingJob() {}
 
   void PerformWorkOnUIThread() {
     DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
     DictionaryPrefUpdate update(g_browser_process->local_state(),
                                 prefs::kGeolocationAccessToken);
     DictionaryValue* token_dictionary = update.Get();
 
-    bool has_old_network_provider_url = false;
+    std::vector<std::string> providers_to_remove;
     // The dictionary value could be NULL if the pref has never been set.
     if (token_dictionary != NULL) {
       for (DictionaryValue::key_iterator it = token_dictionary->begin_keys();
            it != token_dictionary->end_keys(); ++it) {
         GURL url(*it);
         if (!url.is_valid())
           continue;
-        if (url.spec() == kOldDefaultNetworkProviderUrl) {
-          has_old_network_provider_url = true;
+        if (IsUnsupportedNetworkProviderUrl(url)) {
+          providers_to_remove.push_back(*it);
           continue;
         }
         token_dictionary->GetStringWithoutPathExpansion(
             *it, &access_token_set_[url]);
       }
-      if (has_old_network_provider_url)
+      for (size_t i = 0; i < providers_to_remove.size(); ++i) {
         token_dictionary->RemoveWithoutPathExpansion(
-            kOldDefaultNetworkProviderUrl, NULL);
+            providers_to_remove[i], NULL);
+      }
     }
 
     system_request_context_ = g_browser_process->system_request_context();
   }
 
   void RespondOnOriginatingThread() {
     callback_.Run(access_token_set_, system_request_context_);
   }
 
   AccessTokenStore::LoadAccessTokensCallbackType callback_;
@@ skipping 26 matching lines @@
   access_token_dictionary->SetWithoutPathExpansion(
       server_url.spec(), Value::CreateStringValue(token));
 }
 
 void ChromeAccessTokenStore::SaveAccessToken(const GURL& server_url,
                                              const string16& access_token) {
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::Bind(&SetAccessTokenOnUIThread, server_url, access_token));
 }