Replace string16 with base::string16 in src/webkit

webkit/glue/webkit_glue.h

 // Copyright (c) 2012 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_GLUE_WEBKIT_GLUE_H_
 #define WEBKIT_GLUE_WEBKIT_GLUE_H_
 
 #include "base/basictypes.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
 
 #include <string>
 #include <vector>
 
 #include "base/platform_file.h"
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebCanvas.h"
 #include "third_party/WebKit/Source/Platform/chromium/public/WebReferrerPolicy.h"
 #include "webkit/glue/webkit_glue_export.h"
 
 class SkBitmap;
 class SkCanvas;
 
 namespace net {
 class URLRequest;
 }
 
 namespace WebKit {
 struct WebFileInfo;
 class WebFrame;
 }
 
 namespace webkit_glue {
 
 WEBKIT_GLUE_EXPORT void SetJavaScriptFlags(const std::string& flags);
 
 // Turn on logging for flags in the provided comma delimited list.
 WEBKIT_GLUE_EXPORT void EnableWebCoreLogChannels(const std::string& channels);
 
 // Returns the text of the document element.
-WEBKIT_GLUE_EXPORT string16 DumpDocumentText(WebKit::WebFrame* web_frame);
+WEBKIT_GLUE_EXPORT base::string16 DumpDocumentText(WebKit::WebFrame* web_frame);
 
 // Returns the text of the document element and optionally its child frames.
 // If recursive is false, this is equivalent to DumpDocumentText followed by
 // a newline.  If recursive is true, it recursively dumps all frames as text.
-string16 DumpFramesAsText(WebKit::WebFrame* web_frame, bool recursive);
+base::string16 DumpFramesAsText(WebKit::WebFrame* web_frame, bool recursive);
 
 // Returns the renderer's description of its tree (its externalRepresentation).
-WEBKIT_GLUE_EXPORT string16 DumpRenderer(WebKit::WebFrame* web_frame);
+WEBKIT_GLUE_EXPORT base::string16 DumpRenderer(WebKit::WebFrame* web_frame);
 
 // Returns the number of page where the specified element will be put.
 int PageNumberForElementById(WebKit::WebFrame* web_frame,
                              const std::string& id,
                              float page_width_in_pixels,
                              float page_height_in_pixels);
 
 // Returns the number of pages to be printed.
 int NumberOfPages(WebKit::WebFrame* web_frame,
                   float page_width_in_pixels,
                   float page_height_in_pixels);
 
 // Returns a dump of the scroll position of the webframe.
-string16 DumpFrameScrollPosition(WebKit::WebFrame* web_frame, bool recursive);
+base::string16 DumpFrameScrollPosition(WebKit::WebFrame* web_frame,
+                                       bool recursive);
 
 // Returns a dump of the given history state suitable for implementing the
 // dumpBackForwardList command of the testRunner.
-WEBKIT_GLUE_EXPORT string16 DumpHistoryState(const std::string& history_state,
-                                             int indent,
-                                             bool is_current);
+WEBKIT_GLUE_EXPORT base::string16 DumpHistoryState(
+    const std::string& history_state,
+    int indent,
+    bool is_current);
 
 #ifndef NDEBUG
 // Checks various important objects to see if there are any in memory, and
 // calls AppendToLog with any leaked objects. Designed to be called on
 // shutdown.
 WEBKIT_GLUE_EXPORT void CheckForLeaks();
 #endif
 
 // Decodes the image from the data in |image_data| into |image|.
 // Returns false if the image could not be decoded.
@@ skipping 38 matching lines @@
 // computed inside the sandbox and thus its not always accurate.
 WEBKIT_GLUE_EXPORT size_t MemoryUsageKB();
 
 // Converts from zoom factor (zoom percent / 100) to zoom level, where 0 means
 // no zoom, positive numbers mean zoom in, negatives mean zoom out.
 WEBKIT_GLUE_EXPORT double ZoomFactorToZoomLevel(double factor);
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBKIT_GLUE_H_