Replace string16 with base::string16 in src/webkit

webkit/glue/webpreferences.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.
 //
 // A struct for managing webkit's settings.
 //
 // Adding new values to this class probably involves updating
 // WebKit::WebSettings, content/common/view_messages.h, browser/tab_contents/
 // render_view_host_delegate_helper.cc, and browser/profiles/profile.cc.
 
 #ifndef WEBKIT_GLUE_WEBPREFERENCES_H__
 #define WEBKIT_GLUE_WEBPREFERENCES_H__
 
 #include <map>
 #include <string>
 #include <vector>
 
-#include "base/string16.h"
+#include "base/string16.h.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/glue/webkit_glue_export.h"
 
 namespace WebKit {
 class WebView;
 }
 
 namespace webkit_glue {
 
 struct WEBKIT_GLUE_EXPORT WebPreferences {
   // Map of ISO 15924 four-letter script code to font family.  For example,
   // "Arab" to "My Arabic Font".
-  typedef std::map<std::string, string16> ScriptFontFamilyMap;
+  typedef std::map<std::string, base::string16> ScriptFontFamilyMap;
 
   enum EditingBehavior {
     EDITING_BEHAVIOR_MAC,
     EDITING_BEHAVIOR_WIN,
     EDITING_BEHAVIOR_UNIX,
     EDITING_BEHAVIOR_ANDROID
   };
 
   // The ISO 15924 script code for undetermined script aka Common. It's the
   // default used on WebKit's side to get/set a font setting when no script is
@@ skipping 129 matching lines @@
   // the embedder to use the same default value.
   WebPreferences();
   ~WebPreferences();
 
   void Apply(WebKit::WebView* web_view) const;
 };
 
 }  // namespace webkit_glue
 
 #endif  // WEBKIT_GLUE_WEBPREFERENCES_H__