Use base namespace for string16 in chrome/renderer.

chrome/renderer/spellchecker/spellcheck.cc

Index: chrome/renderer/spellchecker/spellcheck.cc
diff --git a/chrome/renderer/spellchecker/spellcheck.cc b/chrome/renderer/spellchecker/spellcheck.cc
index 9af496ba8a292f6bd9c42cdc5ce24ee35230feb6..b08dfeed1170849f5f2468acdfbc6a65260fe514 100644
--- a/chrome/renderer/spellchecker/spellcheck.cc
+++ b/chrome/renderer/spellchecker/spellcheck.cc
@@ -71,18 +71,18 @@ bool DocumentMarkersCollector::Visit(content::RenderView* render_view) {
 
 class SpellCheck::SpellcheckRequest {
  public:
-  SpellcheckRequest(const string16& text,
+  SpellcheckRequest(const base::string16& text,
                     blink::WebTextCheckingCompletion* completion)
       : text_(text), completion_(completion) {
     DCHECK(completion);
   }
   ~SpellcheckRequest() {}
 
-  string16 text() { return text_; }
+  base::string16 text() { return text_; }
   blink::WebTextCheckingCompletion* completion() { return completion_; }
 
  private:
-  string16 text_;  // Text to be checked in this task.
+  base::string16 text_;  // Text to be checked in this task.
 
   // The interface to send the misspelled ranges to WebKit.
   blink::WebTextCheckingCompletion* completion_;
@@ -180,7 +180,7 @@ bool SpellCheck::SpellCheckWord(
     int tag,
     int* misspelling_start,
     int* misspelling_len,
-    std::vector<string16>* optional_suggestions) {
+    std::vector<base::string16>* optional_suggestions) {
   DCHECK(in_word_len >= 0);
   DCHECK(misspelling_start && misspelling_len) << "Out vars must be given.";
 
@@ -196,7 +196,7 @@ bool SpellCheck::SpellCheckWord(
 }
 
 bool SpellCheck::SpellCheckParagraph(
-    const string16& text,
+    const base::string16& text,
     WebVector<WebTextCheckingResult>* results) {
 #if !defined(OS_MACOSX)
   // Mac has its own spell checker, so this method will not be used.
@@ -225,7 +225,7 @@ bool SpellCheck::SpellCheckParagraph(
 
     if (!custom_dictionary_.SpellCheckWord(
             text, misspelling_start + offset, misspelling_length)) {
-      string16 replacement;
+      base::string16 replacement;
       textcheck_results.push_back(WebTextCheckingResult(
           blink::WebTextDecorationTypeSpelling,
           misspelling_start + offset,
@@ -244,8 +244,9 @@ bool SpellCheck::SpellCheckParagraph(
 #endif
 }
 
-string16 SpellCheck::GetAutoCorrectionWord(const string16& word, int tag) {
-  string16 autocorrect_word;
+base::string16 SpellCheck::GetAutoCorrectionWord(const base::string16& word,
+                                                 int tag) {
+  base::string16 autocorrect_word;
   if (!auto_spell_correct_turned_on_)
     return autocorrect_word;  // Return the empty string.
 
@@ -298,7 +299,7 @@ string16 SpellCheck::GetAutoCorrectionWord(const string16& word, int tag) {
 
 #if !defined(OS_MACOSX)  // OSX uses its own spell checker
 void SpellCheck::RequestTextChecking(
-    const string16& text,
+    const base::string16& text,
     blink::WebTextCheckingCompletion* completion) {
   // Clean up the previous request before starting a new request.
   if (pending_request_param_.get())
@@ -347,7 +348,7 @@ void SpellCheck::PerformSpellCheck(SpellcheckRequest* param) {
 void SpellCheck::CreateTextCheckingResults(
     ResultFilter filter,
     int line_offset,
-    const string16& line_text,
+    const base::string16& line_text,
     const std::vector<SpellCheckResult>& spellcheck_results,
     WebVector<WebTextCheckingResult>* textcheck_results) {
   // Double-check misspelled words with our spellchecker and attach grammar