Convert string16 to base::string16 in content.

content/browser/frame_host/navigation_entry_impl.cc

 // 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.
 
 #include "content/browser/frame_host/navigation_entry_impl.h"
 
 #include "base/metrics/histogram.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_constants.h"
@@ skipping 42 matching lines @@
       should_replace_entry_(false),
       should_clear_history_list_(false),
       can_load_local_resources_(false),
       frame_tree_node_id_(-1) {
 }
 
 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()),
       site_instance_(instance),
       bindings_(kInvalidBindings),
       page_type_(PAGE_TYPE_NORMAL),
       url_(url),
       referrer_(referrer),
       update_virtual_url_with_url_(false),
       title_(title),
@@ skipping 49 matching lines @@
 
 void NavigationEntryImpl::SetVirtualURL(const GURL& url) {
   virtual_url_ = (url == url_) ? GURL() : url;
   cached_display_title_.clear();
 }
 
 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_;
 }
 
 void NavigationEntryImpl::SetPageState(const PageState& state) {
   page_state_ = state;
 }
 
 const PageState& NavigationEntryImpl::GetPageState() const {
   return page_state_;
 }
@@ skipping 10 matching lines @@
   site_instance_ = site_instance;
 }
 
 void NavigationEntryImpl::SetBindings(int bindings) {
   // Ensure this is set to a valid value, and that it stays the same once set.
   CHECK_NE(bindings, kInvalidBindings);
   CHECK(bindings_ == kInvalidBindings || bindings_ == 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.
   if (!title_.empty())
     return title_;
 
   // More complicated cases will use the URLs as the title. This result we will
   // cache since it's more complicated to compute.
   if (!cached_display_title_.empty())
     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()) {
     title = net::FormatUrl(url_, languages);
   }
 
   // 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);
   }
 
   gfx::ElideString(title, kMaxTitleChars, &cached_display_title_);
   return cached_display_title_;
 }
 
 bool NavigationEntryImpl::IsViewSourceMode() const {
   return virtual_url_.SchemeIs(kViewSourceScheme);
 }
@@ skipping 96 matching lines @@
 
 void NavigationEntryImpl::SetFrameToNavigate(const std::string& frame_name) {
   frame_to_navigate_ = frame_name;
 }
 
 const std::string& NavigationEntryImpl::GetFrameToNavigate() const {
   return frame_to_navigate_;
 }
 
 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;
   return true;
 }
 
 void NavigationEntryImpl::ClearExtraData(const std::string& key) {
   extra_data_.erase(key);
 }
 
@@ skipping 10 matching lines @@
 }
 
 void NavigationEntryImpl::SetScreenshotPNGData(
     scoped_refptr<base::RefCountedBytes> png_data) {
   screenshot_ = png_data;
   if (screenshot_.get())
     UMA_HISTOGRAM_MEMORY_KB("Overscroll.ScreenshotSize", screenshot_->size());
 }
 
 }  // namespace content