Convert string16 to base::string16 in content.

content/browser/frame_host/navigation_entry_impl.h

 // Copyright 2013 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_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 #define CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "content/browser/site_instance_impl.h"
@@ skipping 11 matching lines @@
   static NavigationEntryImpl* FromNavigationEntry(NavigationEntry* entry);
 
   // The value of bindings() before it is set during commit.
   static int kInvalidBindings;
 
   NavigationEntryImpl();
   NavigationEntryImpl(SiteInstanceImpl* instance,
                       int page_id,
                       const GURL& url,
                       const Referrer& referrer,
-                      const string16& title,
+                      const base::string16& title,
                       PageTransition transition_type,
                       bool is_renderer_initiated);
   virtual ~NavigationEntryImpl();
 
   // NavigationEntry implementation:
   virtual int GetUniqueID() const OVERRIDE;
   virtual PageType GetPageType() const OVERRIDE;
   virtual void SetURL(const GURL& url) OVERRIDE;
   virtual const GURL& GetURL() const OVERRIDE;
   virtual void SetBaseURLForDataURL(const GURL& url) OVERRIDE;
   virtual const GURL& GetBaseURLForDataURL() const OVERRIDE;
   virtual void SetReferrer(const Referrer& referrer) OVERRIDE;
   virtual const Referrer& GetReferrer() const OVERRIDE;
   virtual void SetVirtualURL(const GURL& url) OVERRIDE;
   virtual const GURL& GetVirtualURL() const OVERRIDE;
-  virtual void SetTitle(const string16& title) OVERRIDE;
-  virtual const string16& GetTitle() const OVERRIDE;
+  virtual void SetTitle(const base::string16& title) OVERRIDE;
+  virtual const base::string16& GetTitle() const OVERRIDE;
   virtual void SetPageState(const PageState& state) OVERRIDE;
   virtual const PageState& GetPageState() const OVERRIDE;
   virtual void SetPageID(int page_id) OVERRIDE;
   virtual int32 GetPageID() const OVERRIDE;
-  virtual const string16& GetTitleForDisplay(
+  virtual const base::string16& GetTitleForDisplay(
       const std::string& languages) const OVERRIDE;
   virtual bool IsViewSourceMode() const OVERRIDE;
   virtual void SetTransitionType(PageTransition transition_type) OVERRIDE;
   virtual PageTransition GetTransitionType() const OVERRIDE;
   virtual const GURL& GetUserTypedURL() const OVERRIDE;
   virtual void SetHasPostData(bool has_post_data) OVERRIDE;
   virtual bool GetHasPostData() const OVERRIDE;
   virtual void SetPostID(int64 post_id) OVERRIDE;
   virtual int64 GetPostID() const OVERRIDE;
   virtual void SetBrowserInitiatedPostData(
       const base::RefCountedMemory* data) OVERRIDE;
   virtual const base::RefCountedMemory*
       GetBrowserInitiatedPostData() const OVERRIDE;
   virtual const FaviconStatus& GetFavicon() const OVERRIDE;
   virtual FaviconStatus& GetFavicon() OVERRIDE;
   virtual const SSLStatus& GetSSL() const OVERRIDE;
   virtual SSLStatus& GetSSL() OVERRIDE;
   virtual void SetOriginalRequestURL(const GURL& original_url) OVERRIDE;
   virtual const GURL& GetOriginalRequestURL() const OVERRIDE;
   virtual void SetIsOverridingUserAgent(bool override) OVERRIDE;
   virtual bool GetIsOverridingUserAgent() const OVERRIDE;
   virtual void SetTimestamp(base::Time timestamp) OVERRIDE;
   virtual base::Time GetTimestamp() const OVERRIDE;
   virtual void SetCanLoadLocalResources(bool allow) OVERRIDE;
   virtual bool GetCanLoadLocalResources() const OVERRIDE;
   virtual void SetFrameToNavigate(const std::string& frame_name) OVERRIDE;
   virtual const std::string& GetFrameToNavigate() const OVERRIDE;
   virtual void SetExtraData(const std::string& key,
-                            const string16& data) OVERRIDE;
+                            const base::string16& data) OVERRIDE;
   virtual bool GetExtraData(const std::string& key,
-                            string16* data) const OVERRIDE;
+                            base::string16* data) const OVERRIDE;
   virtual void ClearExtraData(const std::string& key) OVERRIDE;
   virtual void SetHttpStatusCode(int http_status_code) OVERRIDE;
   virtual int GetHttpStatusCode() const OVERRIDE;
 
   // Once a navigation entry is committed, we should no longer track several
   // pieces of non-persisted state, as documented on the members below.
   void ResetForCommit();
 
   void set_unique_id(int unique_id) {
     unique_id_ = unique_id;
@@ skipping 140 matching lines @@
   // See the accessors above for descriptions.
   int unique_id_;
   scoped_refptr<SiteInstanceImpl> site_instance_;
   // TODO(creis): Persist bindings_. http://crbug.com/173672.
   int bindings_;
   PageType page_type_;
   GURL url_;
   Referrer referrer_;
   GURL virtual_url_;
   bool update_virtual_url_with_url_;
-  string16 title_;
+  base::string16 title_;
   FaviconStatus favicon_;
   PageState page_state_;
   int32 page_id_;
   SSLStatus ssl_;
   PageTransition transition_type_;
   GURL user_typed_url_;
   bool has_post_data_;
   int64 post_id_;
   RestoreType restore_type_;
   GURL original_request_url_;
@@ skipping 26 matching lines @@
 
   // Whether the entry, while loading, was created for a renderer-initiated
   // navigation.  This dictates whether the URL should be displayed before the
   // navigation commits.  It is cleared in |ResetForCommit| and not persisted.
   bool is_renderer_initiated_;
 
   // This is a cached version of the result of GetTitleForDisplay. It prevents
   // us from having to do URL formatting on the URL every time the title is
   // displayed. When the URL, virtual URL, or title is set, this should be
   // cleared to force a refresh.
-  mutable string16 cached_display_title_;
+  mutable base::string16 cached_display_title_;
 
   // In case a navigation is transferred to a new RVH but the request has
   // been generated in the renderer already, this identifies the old request so
   // that it can be resumed. The old request is stored until the
   // ResourceDispatcher receives the navigation from the renderer which
   // carries this |transferred_global_request_id_| annotation. Once the request
   // is transferred to the new process, this is cleared and the request
   // continues as normal.
   // Cleared in |ResetForCommit|.
   GlobalRequestID transferred_global_request_id_;
@@ skipping 31 matching lines @@
   // If not -1, this indicates which FrameTreeNode to navigate.  This field is
   // not persisted because it is experimental and only used when the
   // --site-per-process flag is passed.  It is cleared in |ResetForCommit|
   // because we only use it while the navigation is pending.
   // TODO(creis): Move this to FrameNavigationEntry.
   int64 frame_tree_node_id_;
 
   // Used to store extra data to support browser features. This member is not
   // persisted, unless specific data is taken out/put back in at save/restore
   // time (see TabNavigation for an example of this).
-  std::map<std::string, string16> extra_data_;
+  std::map<std::string, base::string16> extra_data_;
 
   // Copy and assignment is explicitly allowed for this class.
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_FRAME_HOST_NAVIGATION_ENTRY_IMPL_H_