Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/mock_spellcheck.h

Index: webkit/tools/test_shell/mock_spellcheck.h
diff --git a/webkit/tools/test_shell/mock_spellcheck.h b/webkit/tools/test_shell/mock_spellcheck.h
index 41b180d6d1bdf5ea1c5e74d8055f660521a3ae03..4752c852dc35a2993492f32c64422ba950035e37 100644
--- a/webkit/tools/test_shell/mock_spellcheck.h
+++ b/webkit/tools/test_shell/mock_spellcheck.h
@@ -8,7 +8,7 @@
 #include <map>
 #include <vector>
 
-#include "base/string16.h"
+#include "base/string16.h.h"
 
 // A mock implementation of a spell-checker used for WebKit tests.
 // This class only implements the minimal functionarities required by WebKit
@@ -29,14 +29,14 @@ class MockSpellCheck {
   // the first invalid word to misspelledLength, respectively.
   // For example, when the given text is "   zz zz", this function sets 3 to
   // misspelledOffset and 2 to misspelledLength, respectively.
-  bool SpellCheckWord(const string16& text,
+  bool SpellCheckWord(const base::string16& text,
                       int* misspelledOffset,
                       int* misspelledLength);
 
   // Emulates suggestions for misspelled words.
   // The suggestions are pushed to |suggestions| parameters.
-  void FillSuggestions(const string16& word,
-                       std::vector<string16>* suggestions);
+  void FillSuggestions(const base::string16& word,
+                       std::vector<base::string16>* suggestions);
  private:
   // Initialize the internal resources if we need to initialize it.
   // Initializing this object may take long time. To prevent from hurting
@@ -48,7 +48,7 @@ class MockSpellCheck {
   bool InitializeIfNeeded();
 
   // A table that consists of misspelled words.
-  std::map<string16, bool> misspelled_words_;
+  std::map<base::string16, bool> misspelled_words_;
 
   // A flag representing whether or not this object is initialized.
   bool initialized_;