Add explicit base namespace to string16 users.

chrome/common/net/url_fixer_upper.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 "chrome/common/net/url_fixer_upper.h"
 
 #include <algorithm>
 
 #if defined(OS_POSIX)
 #include "base/environment.h"
@@ skipping 22 matching lines @@
 url_parse::Component UTF8ComponentToUTF16Component(
     const std::string& text_utf8,
     const url_parse::Component& component_utf8) {
   if (component_utf8.len == -1)
     return url_parse::Component();
 
   std::string before_component_string =
       text_utf8.substr(0, component_utf8.begin);
   std::string component_string = text_utf8.substr(component_utf8.begin,
                                                   component_utf8.len);
-  string16 before_component_string_16 = UTF8ToUTF16(before_component_string);
-  string16 component_string_16 = UTF8ToUTF16(component_string);
+  base::string16 before_component_string_16 =
+      UTF8ToUTF16(before_component_string);
+  base::string16 component_string_16 = UTF8ToUTF16(component_string);
   url_parse::Component component_16(before_component_string_16.length(),
                                     component_string_16.length());
   return component_16;
 }
 
 void UTF8PartsToUTF16Parts(const std::string& text_utf8,
                            const url_parse::Parsed& parts_utf8,
                            url_parse::Parsed* parts) {
   if (IsStringASCII(text_utf8)) {
     *parts = parts_utf8;
@@ skipping 18 matching lines @@
       UTF8ComponentToUTF16Component(text_utf8, parts_utf8.ref);
 }
 
 TrimPositions TrimWhitespaceUTF8(const std::string& input,
                                  TrimPositions positions,
                                  std::string* output) {
   // This implementation is not so fast since it converts the text encoding
   // twice. Please feel free to file a bug if this function hurts the
   // performance of Chrome.
   DCHECK(IsStringUTF8(input));
-  string16 input16 = UTF8ToUTF16(input);
-  string16 output16;
+  base::string16 input16 = UTF8ToUTF16(input);
+  base::string16 output16;
   TrimPositions result = TrimWhitespace(input16, positions, &output16);
   *output = UTF16ToUTF8(output16);
   return result;
 }
 
 // does some basic fixes for input that we want to test for file-ness
 void PrepareStringForFileOps(const base::FilePath& text,
                              base::FilePath::StringType* output) {
 #if defined(OS_WIN)
   TrimWhitespace(text.value(), TRIM_ALL, output);
@@ skipping 381 matching lines @@
 }
 
 }  // namespace
 
 std::string URLFixerUpper::SegmentURL(const std::string& text,
                                       url_parse::Parsed* parts) {
   std::string mutable_text(text);
   return SegmentURLInternal(&mutable_text, parts);
 }
 
-string16 URLFixerUpper::SegmentURL(const string16& text,
-                                   url_parse::Parsed* parts) {
+base::string16 URLFixerUpper::SegmentURL(const base::string16& text,
+                                         url_parse::Parsed* parts) {
   std::string text_utf8 = UTF16ToUTF8(text);
   url_parse::Parsed parts_utf8;
   std::string scheme_utf8 = SegmentURL(text_utf8, &parts_utf8);
   UTF8PartsToUTF16Parts(text_utf8, parts_utf8, parts);
   return UTF8ToUTF16(scheme_utf8);
 }
 
 GURL URLFixerUpper::FixupURL(const std::string& text,
                              const std::string& desired_tld) {
   std::string trimmed;
@@ skipping 138 matching lines @@
 
   if (part->is_valid()) {
     // Offset the location of this component.
     part->begin += offset;
 
     // This part might not have existed in the original text.
     if (part->begin < 0)
       part->reset();
   }
 }