Rename GetStringAsUTF16() to GetString() (and overload), etc.

chrome/browser/geolocation/access_token_store.cc

 // Copyright (c) 2010 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/access_token_store.h"
 
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_thread.h"
@@ skipping 32 matching lines @@
               prefs::kGeolocationAccessToken);
 
   AccessTokenStore::AccessTokenSet access_token_set;
   // 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;
-      token_dictionary->GetStringAsUTF16WithoutPathExpansion(
-          *it, &access_token_set[url]);
+      token_dictionary->GetStringWithoutPathExpansion(*it,
+                                                      &access_token_set[url]);
     }
   }
   request->ForwardResultAsync(MakeTuple(access_token_set));
 }
 
 void ChromePrefsAccessTokenStore::DoLoadAccessTokens(
     scoped_refptr<CancelableRequest<LoadAccessTokensCallbackType> > request) {
   ChromeThread::PostTask(ChromeThread::UI, FROM_HERE, NewRunnableMethod(
       this, &ChromePrefsAccessTokenStore::LoadDictionaryStoreInUIThread,
       request));
@@ skipping 35 matching lines @@
   DCHECK(request->handle());
 
   DoLoadAccessTokens(request);
   return request->handle();
 }
 
 // Creates a new access token store backed by the global chome prefs.
 AccessTokenStore* NewChromePrefsAccessTokenStore() {
   return new ChromePrefsAccessTokenStore;
 }