Convert string16 to base::string16 in content.

content/browser/frame_host/navigation_entry_impl.cc

Index: content/browser/frame_host/navigation_entry_impl.cc
diff --git a/content/browser/frame_host/navigation_entry_impl.cc b/content/browser/frame_host/navigation_entry_impl.cc
index a9b37cc5db0ff9b86edbaa51d33848ed3a586ab8..d5d6fc2c982e8e97c60c0edde8e8a438fd2d7822 100644
--- a/content/browser/frame_host/navigation_entry_impl.cc
+++ b/content/browser/frame_host/navigation_entry_impl.cc
@@ -60,7 +60,7 @@ 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)
     : unique_id_(GetUniqueIDInConstructor()),
@@ -130,12 +130,12 @@ const GURL& NavigationEntryImpl::GetVirtualURL() const {
   return virtual_url_.is_empty() ? url_ : virtual_url_;
 }
 
-void NavigationEntryImpl::SetTitle(const string16& title) {
+void NavigationEntryImpl::SetTitle(const base::string16& title) {
   title_ = title;
   cached_display_title_.clear();
 }
 
-const string16& NavigationEntryImpl::GetTitle() const {
+const base::string16& NavigationEntryImpl::GetTitle() const {
   return title_;
 }
 
@@ -166,7 +166,7 @@ void NavigationEntryImpl::SetBindings(int bindings) {
   bindings_ = bindings;
 }
 
-const string16& NavigationEntryImpl::GetTitleForDisplay(
+const base::string16& NavigationEntryImpl::GetTitleForDisplay(
     const std::string& languages) const {
   // Most pages have real titles. Don't even bother caching anything if this is
   // the case.
@@ -179,7 +179,7 @@ const string16& NavigationEntryImpl::GetTitleForDisplay(
     return cached_display_title_;
 
   // Use the virtual URL first if any, and fall back on using the real URL.
-  string16 title;
+  base::string16 title;
   if (!virtual_url_.is_empty()) {
     title = net::FormatUrl(virtual_url_, languages);
   } else if (!url_.is_empty()) {
@@ -188,8 +188,8 @@ const string16& NavigationEntryImpl::GetTitleForDisplay(
 
   // For file:// URLs use the filename as the title, not the full path.
   if (url_.SchemeIsFile()) {
-    string16::size_type slashpos = title.rfind('/');
-    if (slashpos != string16::npos)
+    base::string16::size_type slashpos = title.rfind('/');
+    if (slashpos != base::string16::npos)
       title = title.substr(slashpos + 1);
   }
 
@@ -306,13 +306,14 @@ const std::string& NavigationEntryImpl::GetFrameToNavigate() const {
 }
 
 void NavigationEntryImpl::SetExtraData(const std::string& key,
-                                       const string16& data) {
+                                       const base::string16& data) {
   extra_data_[key] = data;
 }
 
 bool NavigationEntryImpl::GetExtraData(const std::string& key,
-                                       string16* data) const {
-  std::map<std::string, string16>::const_iterator iter = extra_data_.find(key);
+                                       base::string16* data) const {
+  std::map<std::string, base::string16>::const_iterator iter =
+      extra_data_.find(key);
   if (iter == extra_data_.end())
     return false;
   *data = iter->second;