Convert string16 to base::string16 in content.

content/renderer/java/java_bridge_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/java/java_bridge_dispatcher.h"
 
 #include "content/child/child_process.h"
 #include "content/child/npapi/npobject_util.h"  // For CreateNPVariant()
 #include "content/common/java_bridge_messages.h"
 #include "content/public/renderer/render_thread.h"
@@ skipping 47 matching lines @@
       iter != objects_.end(); ++iter) {
     // This refs the NPObject. This reference is dropped when either the window
     // object is later cleared, or the object is GC'ed. So the object may be
     // deleted at any time after OnRemoveNamedObject() is called.
     web_frame->bindToWindowObject(iter->first,
         NPVARIANT_TO_OBJECT(iter->second));
   }
 }
 
 void JavaBridgeDispatcher::OnAddNamedObject(
-    const string16& name,
+    const base::string16& name,
     const NPVariant_Param& variant_param) {
   DCHECK_EQ(variant_param.type, NPVARIANT_PARAM_SENDER_OBJECT_ROUTING_ID);
 
   EnsureChannelIsSetUp();
   if (!channel_.get()) {
     // It's possible for |channel_| to be NULL if the RenderView is going away.
     return;
   }
 
   // This creates an NPObject, wrapped as an NPVariant. Pass 0 for the for
   // containing window, as this is only used by plugins to pump the window
   // message queue when a method on a renderer-side object causes a dialog to
   // be displayed, and the Java Bridge does not need this functionality. The
   // page URL is also not required.
   NPVariant variant;
   bool created =
       CreateNPVariant(variant_param, channel_.get(), &variant, 0, GURL());
   DCHECK(created);
   DCHECK_EQ(variant.type, NPVariantType_Object);
 
   // The NPObject is created with a ref count of one, which we remove when
   // OnRemoveNamedObject() is called for that object.
   ObjectMap::iterator iter = objects_.find(name);
   if (iter != objects_.end()) {
     blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
   }
   objects_[name] = variant;
 }
 
-void JavaBridgeDispatcher::OnRemoveNamedObject(const string16& name) {
+void JavaBridgeDispatcher::OnRemoveNamedObject(const base::string16& name) {
   if (!channel_.get()) {
     DCHECK(objects_.empty());
     return;
   }
 
   // Removing an object does not unbind it from JavaScript until the window
   // object is next cleared. Note that the browser checks that the named object
   // is present.
   ObjectMap::iterator iter = objects_.find(name);
   DCHECK(iter != objects_.end());
   blink::WebBindings::releaseObject(NPVARIANT_TO_OBJECT(iter->second));
   objects_.erase(iter);
 }
 
 }  // namespace content