Convert string16 to base::string16 in content.

content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
 #define CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_
 
 #include <map>
 
 #include "base/android/jni_helper.h"
@@ skipping 16 matching lines @@
 class JavaBridgeDispatcherHostManager
     : public WebContentsObserver,
       public base::SupportsWeakPtr<JavaBridgeDispatcherHostManager> {
  public:
   explicit JavaBridgeDispatcherHostManager(WebContents* web_contents);
   virtual ~JavaBridgeDispatcherHostManager();
 
   // These methods add or remove the object to each JavaBridgeDispatcherHost.
   // Each one holds a reference to the NPObject while the object is bound to
   // the corresponding RenderView. See JavaBridgeDispatcherHost for details.
-  void AddNamedObject(const string16& name, NPObject* object);
-  void RemoveNamedObject(const string16& name);
+  void AddNamedObject(const base::string16& name, NPObject* object);
+  void RemoveNamedObject(const base::string16& name);
 
   void OnGetChannelHandle(RenderViewHost* render_view_host,
                           IPC::Message* reply_msg);
 
   // Every time a JavaBoundObject backed by a real Java object is
   // created/destroyed, we insert/remove a strong ref to that Java object into
   // this set so that it doesn't get garbage collected while it's still
   // potentially in use. Although the set is managed native side, it's owned
   // and defined in Java so that pushing refs into it does not create new GC
   // roots that would prevent ContentViewCore from being garbage collected.
   void SetRetainedObjectSet(const JavaObjectWeakGlobalRef& retained_object_set);
 
   // WebContentsObserver overrides
   virtual void RenderViewCreated(RenderViewHost* render_view_host) OVERRIDE;
   virtual void RenderViewDeleted(RenderViewHost* render_view_host) OVERRIDE;
   virtual void DocumentAvailableInMainFrame() OVERRIDE;
 
   void JavaBoundObjectCreated(const base::android::JavaRef<jobject>& object);
   void JavaBoundObjectDestroyed(const base::android::JavaRef<jobject>& object);
 
  private:
   typedef std::map<RenderViewHost*, scoped_refptr<JavaBridgeDispatcherHost> >
       InstanceMap;
   InstanceMap instances_;
-  typedef std::map<string16, NPObject*> ObjectMap;
+  typedef std::map<base::string16, NPObject*> ObjectMap;
   ObjectMap objects_;
   JavaObjectWeakGlobalRef retained_object_set_;
 
   DISALLOW_COPY_AND_ASSIGN(JavaBridgeDispatcherHostManager);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_JAVA_JAVA_BRIDGE_DISPATCHER_HOST_MANAGER_H_