Move webpreferences.* from webkit/ to content/

content/renderer/web_preferences.cc

Index: content/renderer/web_preferences.cc
diff --git a/content/renderer/web_preferences.cc b/content/renderer/web_preferences.cc
index bd975fd85f4848a1fa97316ae8b98c7d4b87302c..5fef1f8463178900d77099b6490aab30eeaf05e6 100644
--- a/content/renderer/web_preferences.cc
+++ b/content/renderer/web_preferences.cc
@@ -5,6 +5,7 @@
 #include "content/public/renderer/web_preferences.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "content/public/common/webpreferences.h"
 #include "content/renderer/net_info_helper.h"
 #include "third_party/WebKit/public/platform/WebConnectionType.h"
 #include "third_party/WebKit/public/platform/WebString.h"
@@ -16,7 +17,6 @@
 #include "third_party/WebKit/public/web/WebView.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 #include "third_party/icu/source/common/unicode/uscript.h"
-#include "webkit/common/webpreferences.h"
 
 using blink::WebNetworkStateNotifier;
 using blink::WebRuntimeFeatures;
@@ -97,11 +97,10 @@ UScriptCode GetScriptForWebSettings(UScriptCode scriptCode) {
   }
 }
 
-void ApplyFontsFromMap(const webkit_glue::ScriptFontFamilyMap& map,
+void ApplyFontsFromMap(const ScriptFontFamilyMap& map,
                        SetFontFamilyWrapper setter,
                        WebSettings* settings) {
-  for (webkit_glue::ScriptFontFamilyMap::const_iterator it = map.begin();
-       it != map.end();
+  for (ScriptFontFamilyMap::const_iterator it = map.begin(); it != map.end();
        ++it) {
     int32 script = u_getPropertyValueEnum(UCHAR_SCRIPT, (it->first).c_str());
     if (script >= 0 && script < USCRIPT_CODE_LIMIT) {
@@ -234,7 +233,7 @@ void ApplyWebPreferences(const WebPreferences& prefs, WebView* web_view) {
       prefs.asynchronous_spell_checking_enabled);
   settings->setUnifiedTextCheckerEnabled(prefs.unified_textchecker_enabled);
 
-  for (webkit_glue::WebInspectorPreferences::const_iterator it =
+  for (WebInspectorPreferences::const_iterator it =
            prefs.inspector_settings.begin();
        it != prefs.inspector_settings.end();
        ++it) {