Replace string16 with base::string16 in src/webkit

webkit/tools/test_shell/test_navigation_controller.h

 // Copyright (c) 2011 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.
 
 #ifndef WEBKIT_TOOLS_TEST_SHELL_TEST_NAVIGATION_CONTROLLER_H_
 #define WEBKIT_TOOLS_TEST_SHELL_TEST_NAVIGATION_CONTROLLER_H_
 
 #include <string>
 #include <vector>
 
 #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"
 
 class GURL;
 class TestShell;
 
 // Associated with browser-initated navigations to hold tracking data.
 class TestShellExtraData : public WebKit::WebDataSource::ExtraData {
  public:
   TestShellExtraData(int32 pending_page_id)
       : pending_page_id(pending_page_id),
         request_committed(false) {
   }
 
   // Contains the page_id for this navigation or -1 if there is none yet.
   int32 pending_page_id;
 
   // True if we have already processed the "DidCommitLoad" event for this
   // request.  Used by session history.
   bool request_committed;
 };
 
 // Stores one back/forward navigation state for the test shell.
 class TestNavigationEntry {
  public:
   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();
 
   // Set / Get the URI
   void SetURL(const GURL& url) { url_ = url; }
   const GURL& GetURL() const { return url_; }
 
   // Set / Get opaque state.
   // WARNING: This state is saved to the database and used to restore previous
   // states. If you use write a custom TabContents and provide your own
   // state make sure you have the ability to modify the format in the future
   // while being able to deal with older versions.
   void SetContentState(const std::string& state);
   const std::string& GetContentState() const { return state_; }
 
   // Get the page id corresponding to the tab's state.
   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
   // for all tab contents types.
   int32 page_id_;
 
   GURL url_;
   std::string state_;
 
-  string16 target_frame_;
+  base::string16 target_frame_;
 
   DISALLOW_COPY_AND_ASSIGN(TestNavigationEntry);
 };
 
 // Test shell's NavigationController.  The goal is to be as close to the Chrome
 // version as possible.
 class TestNavigationController {
  public:
   TestNavigationController(TestShell* shell);
   ~TestNavigationController();
@@ skipping 90 matching lines @@
   // new entry (created by LoadURL).
   int pending_entry_index_;
 
   TestShell* shell_;
   int max_page_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TestNavigationController);
 };
 
 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_NAVIGATION_CONTROLLER_H_