Convert string16 to base::string16 in content.

content/renderer/geolocation_dispatcher.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/renderer/geolocation_dispatcher.h"
 
 #include "content/common/geolocation_messages.h"
 #include "content/renderer/render_view_impl.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 #include "third_party/WebKit/public/web/WebGeolocationPermissionRequest.h"
@@ skipping 69 matching lines @@
   // WebCore::GeolocationController already caches the last position it
   // receives, so there is not much benefit to more position caching here.
   return false;
 }
 
 // TODO(jknotten): Change the messages to use a security origin, so no
 // conversion is necessary.
 void GeolocationDispatcher::requestPermission(
     const WebGeolocationPermissionRequest& permissionRequest) {
   int bridge_id = pending_permissions_->add(permissionRequest);
-  string16 origin = permissionRequest.securityOrigin().toString();
+  base::string16 origin = permissionRequest.securityOrigin().toString();
   Send(new GeolocationHostMsg_RequestPermission(
       routing_id(), bridge_id, GURL(origin)));
 }
 
 // TODO(jknotten): Change the messages to use a security origin, so no
 // conversion is necessary.
 void GeolocationDispatcher::cancelPermissionRequest(
     const WebGeolocationPermissionRequest& permissionRequest) {
   int bridge_id;
   if (!pending_permissions_->remove(permissionRequest, bridge_id))
     return;
-  string16 origin = permissionRequest.securityOrigin().toString();
+  base::string16 origin = permissionRequest.securityOrigin().toString();
   Send(new GeolocationHostMsg_CancelPermissionRequest(
       routing_id(), bridge_id, GURL(origin)));
 }
 
 // Permission for using geolocation has been set.
 void GeolocationDispatcher::OnPermissionSet(int bridge_id, bool is_allowed) {
   WebGeolocationPermissionRequest permissionRequest;
   if (!pending_permissions_->remove(bridge_id, permissionRequest))
     return;
   permissionRequest.setIsAllowed(is_allowed);
@@ skipping 35 matching lines @@
         NOTREACHED() << geoposition.error_code;
         return;
     }
     controller_->errorOccurred(
         WebGeolocationError(
             code, blink::WebString::fromUTF8(geoposition.error_message)));
   }
 }
 
 }  // namespace content