Convert string16 to base::string16 in content.

content/browser/geolocation/location_arbitrator_impl.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 "content/browser/geolocation/location_arbitrator_impl.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 131 matching lines @@
 AccessTokenStore* LocationArbitratorImpl::GetAccessTokenStore() {
   if (!access_token_store_.get())
     access_token_store_ = NewAccessTokenStore();
   return access_token_store_.get();
 }
 
 LocationProvider* LocationArbitratorImpl::NewNetworkLocationProvider(
     AccessTokenStore* access_token_store,
     net::URLRequestContextGetter* context,
     const GURL& url,
-    const string16& access_token) {
+    const base::string16& access_token) {
 #if defined(OS_ANDROID)
   // Android uses its own SystemLocationProvider.
   return NULL;
 #else
   return new NetworkLocationProvider(access_token_store, context, url,
                                      access_token);
 #endif
 }
 
 LocationProvider* LocationArbitratorImpl::NewSystemLocationProvider() {
@@ skipping 32 matching lines @@
     }
   }
   return false;
 }
 
 bool LocationArbitratorImpl::HasPermissionBeenGranted() const {
   return is_permission_granted_;
 }
 
 }  // namespace content