Convert string16 to base::string16 in content.

content/renderer/android/phone_number_detector.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/renderer/android/phone_number_detector.h"
 
 #include <algorithm>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 36 matching lines @@
 }
 
 GURL PhoneNumberDetector::GetIntentURL(const std::string& content_text) {
   if (content_text.empty())
     return GURL();
 
   return GURL(kPhoneNumberPrefix +
       net::EscapeQueryParamValue(content_text, true));
 }
 
-bool PhoneNumberDetector::FindContent(const string16::const_iterator& begin,
-                                      const string16::const_iterator& end,
-                                      size_t* start_pos,
-                                      size_t* end_pos,
-                                      std::string* content_text) {
-  string16 utf16_input = string16(begin, end);
+bool PhoneNumberDetector::FindContent(
+    const base::string16::const_iterator& begin,
+    const base::string16::const_iterator& end,
+    size_t* start_pos,
+    size_t* end_pos,
+    std::string* content_text) {
+  base::string16 utf16_input = base::string16(begin, end);
   std::string utf8_input = UTF16ToUTF8(utf16_input);
 
   PhoneNumberMatcher matcher(utf8_input, region_code_);
   if (matcher.HasNext()) {
     PhoneNumberMatch match;
     matcher.Next(&match);
 
     PhoneNumberUtil* phone_util = PhoneNumberUtil::GetInstance();
     phone_util->FormatNumberForMobileDialing(match.number(), region_code_,
                                              false, /* with_formatting */
                                              content_text);
     // If the number can't be dialed from the current region, the formatted
     // string will be empty.
     if (content_text->empty())
       return false;
 
     // Need to return start_pos and end_pos relative to a UTF16 encoding.
     *start_pos = UTF8ToUTF16(utf8_input.substr(0, match.start())).length();
     *end_pos = *start_pos + UTF8ToUTF16(match.raw_string()).length();
 
     return true;
   }
 
   return false;
 }
 
 }  // namespace content