Add base:: to straggling string16 in content/.

content/shell/renderer/test_runner/MockSpellCheck.cpp

 // 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/shell/renderer/test_runner/MockSpellCheck.h"
 
 #include "content/shell/renderer/test_runner/TestCommon.h"
 #include "third_party/WebKit/public/platform/WebCString.h"
 
 using namespace blink;
@@ skipping 24 matching lines @@
     BLINK_ASSERT(misspelledOffset);
     BLINK_ASSERT(misspelledLength);
 
     // Initialize this spellchecker.
     initializeIfNeeded();
 
     // Reset the result values as our spellchecker does.
     *misspelledOffset = 0;
     *misspelledLength = 0;
 
-    // Convert to a string16 because we store string16 instances in
+    // Convert to a base::string16 because we store base::string16 instances in
     // m_misspelledWords and WebString has no find().
-    string16 stringText = text;
+    base::string16 stringText = text;
     int skippedLength = 0;
 
     while (!stringText.empty()) {
         // Extract the first possible English word from the given string.
         // The given string may include non-ASCII characters or numbers. So, we
         // should filter out such characters before start looking up our
         // misspelled-word table.
         // (This is a simple version of our SpellCheckWordIterator class.)
         // If the given string doesn't include any ASCII characters, we can treat the
         // string as valid one.
-        string16::iterator firstChar = find_if(stringText.begin(), stringText.end(), isASCIIAlpha);
+        base::string16::iterator firstChar = find_if(stringText.begin(), stringText.end(), isASCIIAlpha);
         if (firstChar == stringText.end())
             return true;
         int wordOffset = distance(stringText.begin(), firstChar);
         int maxWordLength = static_cast<int>(stringText.length()) - wordOffset;
         int wordLength;
-        string16 word;
+        base::string16 word;
 
         // Look up our misspelled-word table to check if the extracted word is a
         // known misspelled word, and return the offset and the length of the
         // extracted word if this word is a known misspelled word.
         // (See the comment in MockSpellCheck::initializeIfNeeded() why we use a
         // misspelled-word table.)
         for (size_t i = 0; i < m_misspelledWords.size(); ++i) {
             wordLength = static_cast<int>(m_misspelledWords.at(i).length()) > maxWordLength ? maxWordLength : static_cast<int>(m_misspelledWords.at(i).length());
             word = stringText.substr(wordOffset, wordLength);
             if (word == m_misspelledWords.at(i) && (static_cast<int>(stringText.length()) == wordOffset + wordLength || isNotASCIIAlpha(stringText[wordOffset + wordLength]))) {
                 *misspelledOffset = wordOffset + skippedLength;
                 *misspelledLength = wordLength;
                 break;
             }
         }
 
         if (*misspelledLength > 0)
             break;
 
-        string16::iterator lastChar = find_if(stringText.begin() + wordOffset, stringText.end(), isNotASCIIAlpha);
+        base::string16::iterator lastChar = find_if(stringText.begin() + wordOffset, stringText.end(), isNotASCIIAlpha);
         if (lastChar == stringText.end())
             wordLength = static_cast<int>(stringText.length()) - wordOffset;
         else
             wordLength = distance(firstChar, lastChar);
 
         BLINK_ASSERT(0 < wordOffset + wordLength);
         stringText = stringText.substr(wordOffset + wordLength);
         skippedLength += wordOffset + wordLength;
     }
 
@@ skipping 68 matching lines @@
         // The following words are used by unit tests.
         "ifmmp",
         "qwertyuiopasd",
         "qwertyuiopasdf",
         "upper case",
         "wellcome"
     };
 
     m_misspelledWords.clear();
     for (size_t i = 0; i < arraysize(misspelledWords); ++i)
-        m_misspelledWords.push_back(string16(misspelledWords[i], misspelledWords[i] + strlen(misspelledWords[i])));
+        m_misspelledWords.push_back(base::string16(misspelledWords[i], misspelledWords[i] + strlen(misspelledWords[i])));
 
     // Mark as initialized to prevent this object from being initialized twice
     // or more.
     m_initialized = true;
 
     // Since this MockSpellCheck class doesn't download dictionaries, this
     // function always returns false.
     return false;
 }
 
 }