Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_navigation_controller.h

Index: webkit/tools/test_shell/test_navigation_controller.h
diff --git a/webkit/tools/test_shell/test_navigation_controller.h b/webkit/tools/test_shell/test_navigation_controller.h
index 17de056b95b0a684f51ce82ef91bb0a0742a23b7..416d0f334a9ce7d5449450de876ac98490812d8a 100644
--- a/webkit/tools/test_shell/test_navigation_controller.h
+++ b/webkit/tools/test_shell/test_navigation_controller.h
@@ -11,7 +11,7 @@
 #include "base/basictypes.h"
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "googleurl/src/gurl.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebDataSource.h"
 
@@ -40,7 +40,7 @@ class TestNavigationEntry {
   TestNavigationEntry();
   TestNavigationEntry(int page_id,
                       const GURL& url,
-                      const string16& target_frame);
+                      const base::string16& target_frame);
 
   // Virtual to allow test_shell to extend the class.
   ~TestNavigationEntry();
@@ -61,7 +61,7 @@ class TestNavigationEntry {
   void SetPageID(int page_id) { page_id_ = page_id; }
   int32 GetPageID() const { return page_id_; }
 
-  const string16& GetTargetFrame() const { return target_frame_; }
+  const base::string16& GetTargetFrame() const { return target_frame_; }
 
  private:
   // Describes the current page that the tab represents. This is not relevant
@@ -71,7 +71,7 @@ class TestNavigationEntry {
   GURL url_;
   std::string state_;
 
-  string16 target_frame_;
+  base::string16 target_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(TestNavigationEntry);
 };