Convert string16 to base::string16 in content.

content/child/browser_font_resource_trusted.cc

 // 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.
 
 #include "content/child/browser_font_resource_trusted.h"
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ppapi/c/dev/ppb_font_dev.h"
 #include "ppapi/proxy/connection.h"
@@ skipping 25 matching lines @@
 using blink::WebCanvas;
 
 namespace content {
 
 namespace {
 
 // Same as WebPreferences::kCommonScript. I'd use that directly here, but get an
 // undefined reference linker error.
 const char kCommonScript[] = "Zyyy";
 
-string16 GetFontFromMap(
+base::string16 GetFontFromMap(
     const webkit_glue::ScriptFontFamilyMap& map,
     const std::string& script) {
   webkit_glue::ScriptFontFamilyMap::const_iterator it =
       map.find(script);
   if (it != map.end())
     return it->second;
-  return string16();
+  return base::string16();
 }
 
 // Splits a PP_BrowserFont_Trusted_TextRun into a sequence or LTR and RTL
 // WebTextRuns that can be used for WebKit. Normally WebKit does this for us,
 // but the font drawing and measurement routines we call happen after this
 // step. So for correct rendering of RTL content, we need to do it ourselves.
 class TextRunCollection {
  public:
   explicit TextRunCollection(const PP_BrowserFont_Trusted_TextRun& run)
       : bidi_(NULL),
@@ skipping 14 matching lines @@
       if (U_SUCCESS(uerror))
         num_runs_ = ubidi_countRuns(bidi_, &uerror);
     }
   }
 
   ~TextRunCollection() {
     if (bidi_)
       ubidi_close(bidi_);
   }
 
-  const string16& text() const { return text_; }
+  const base::string16& text() const { return text_; }
   int num_runs() const { return num_runs_; }
 
   // Returns a WebTextRun with the info for the run at the given index.
   // The range covered by the run is in the two output params.
   WebTextRun GetRunAt(int index, int32_t* run_start, int32_t* run_len) const {
     DCHECK(index < num_runs_);
     if (bidi_) {
       bool run_rtl = !!ubidi_getVisualRun(bidi_, index, run_start, run_len);
-      return WebTextRun(string16(&text_[*run_start], *run_len),
+      return WebTextRun(base::string16(&text_[*run_start], *run_len),
                         run_rtl, true);
     }
 
     // Override run, return the single one.
     DCHECK(index == 0);
     *run_start = 0;
     *run_len = static_cast<int32_t>(text_.size());
     return override_run_;
   }
 
  private:
   // Will be null if we skipped autodetection.
   UBiDi* bidi_;
 
   // Text of all the runs.
-  string16 text_;
+  base::string16 text_;
 
   int num_runs_;
 
   // When the content specifies override_direction (bidi_ is null) then this
   // will contain the single text run for WebKit.
   WebTextRun override_run_;
 
   DISALLOW_COPY_AND_ASSIGN(TextRunCollection);
 };
 
@@ skipping 36 matching lines @@
   COMPILE_ASSERT(WebFontDescription::GenericFamilySansSerif ==
                  PP_FAMILY_TO_WEB_FAMILY(PP_FONTFAMILY_SANSSERIF),
                  SansSerifFamily);
   COMPILE_ASSERT(WebFontDescription::GenericFamilyMonospace ==
                  PP_FAMILY_TO_WEB_FAMILY(PP_FONTFAMILY_MONOSPACE),
                  MonospaceFamily);
 
   StringVar* face_name = StringVar::FromPPVar(font.face);  // Possibly null.
 
   WebFontDescription result;
-  string16 resolved_family;
+  base::string16 resolved_family;
   if (!face_name || face_name->value().empty()) {
     // Resolve the generic family.
     switch (font.family) {
       case PP_BROWSERFONT_TRUSTED_FAMILY_SERIF:
         resolved_family = GetFontFromMap(prefs.serif_font_family_map,
                                          kCommonScript);
         break;
       case PP_BROWSERFONT_TRUSTED_FAMILY_SANSSERIF:
         resolved_family = GetFontFromMap(prefs.sans_serif_font_family_map,
                                          kCommonScript);
@@ skipping 238 matching lines @@
 
     // Advance to the next run. Note that we avoid doing this for the last run
     // since it's unnecessary, measuring text is slow, and most of the time
     // there will be only one run anyway.
     if (i != runs.num_runs() - 1)
       web_position.x += font_->calculateWidth(run);
   }
 }
 
 }  // namespace content