Convert string16 to base::string16 in content.

content/browser/webui/web_ui_impl.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_WEBUI_WEB_UI_IMPL_H_
 #define CONTENT_BROWSER_WEBUI_WEB_UI_IMPL_H_
 
 #include <map>
 
 #include "base/compiler_specific.h"
@@ skipping 15 matching lines @@
   // Called by WebContentsImpl when the RenderView is first created. This is
   // *not* called for every page load because in some cases
   // RenderFrameHostManager will reuse RenderView instances.
   void RenderViewCreated(RenderViewHost* render_view_host);
 
   // WebUI implementation:
   virtual WebContents* GetWebContents() const OVERRIDE;
   virtual WebUIController* GetController() const OVERRIDE;
   virtual void SetController(WebUIController* controller) OVERRIDE;
   virtual ui::ScaleFactor GetDeviceScaleFactor() const OVERRIDE;
-  virtual const string16& GetOverriddenTitle() const OVERRIDE;
-  virtual void OverrideTitle(const string16& title) OVERRIDE;
+  virtual const base::string16& GetOverriddenTitle() const OVERRIDE;
+  virtual void OverrideTitle(const base::string16& title) OVERRIDE;
   virtual PageTransition GetLinkTransitionType() const OVERRIDE;
   virtual void SetLinkTransitionType(PageTransition type) OVERRIDE;
   virtual int GetBindings() const OVERRIDE;
   virtual void SetBindings(int bindings) OVERRIDE;
   virtual void SetFrameXPath(const std::string& xpath) OVERRIDE;
   virtual void AddMessageHandler(WebUIMessageHandler* handler) OVERRIDE;
   typedef base::Callback<void(const base::ListValue*)> MessageCallback;
   virtual void RegisterMessageCallback(
       const std::string& message,
       const MessageCallback& callback) OVERRIDE;
@@ skipping 23 matching lines @@
   // IPC::Listener implementation:
   virtual bool OnMessageReceived(const IPC::Message& message) OVERRIDE;
 
  private:
   // IPC message handling.
   void OnWebUISend(const GURL& source_url,
                    const std::string& message,
                    const base::ListValue& args);
 
   // Execute a string of raw Javascript on the page.
-  void ExecuteJavascript(const string16& javascript);
+  void ExecuteJavascript(const base::string16& javascript);
 
   // A map of message name -> message handling callback.
   typedef std::map<std::string, MessageCallback> MessageCallbackMap;
   MessageCallbackMap message_callbacks_;
 
   // Options that may be overridden by individual Web UI implementations. The
   // bool options default to false. See the public getters for more information.
-  string16 overridden_title_;  // Defaults to empty string.
+  base::string16 overridden_title_;  // Defaults to empty string.
   PageTransition link_transition_type_;  // Defaults to LINK.
   int bindings_;  // The bindings from BindingsPolicy that should be enabled for
                   // this page.
 
   // The WebUIMessageHandlers we own.
   ScopedVector<WebUIMessageHandler> handlers_;
 
   // Non-owning pointer to the WebContents this WebUI is associated with.
   WebContents* web_contents_;
 
   // The path for the iframe this WebUI is embedded in (empty if not in an
   // iframe).
   std::string frame_xpath_;
 
   scoped_ptr<WebUIController> controller_;
 
   DISALLOW_COPY_AND_ASSIGN(WebUIImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEBUI_WEB_UI_IMPL_H_