Move webpreferences.* from webkit/ to content/

content/renderer/web_preferences.cc

 // Copyright 2013 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.
 
 #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"
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebKit.h"
 #include "third_party/WebKit/public/web/WebNetworkStateNotifier.h"
 #include "third_party/WebKit/public/web/WebRuntimeFeatures.h"
 #include "third_party/WebKit/public/web/WebSettings.h"
 #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;
 using blink::WebSettings;
 using blink::WebString;
 using blink::WebURL;
 using blink::WebView;
 
 namespace content {
 
@@ skipping 60 matching lines @@
   case USCRIPT_KATAKANA:
   case USCRIPT_JAPANESE:
     return USCRIPT_KATAKANA_OR_HIRAGANA;
   case USCRIPT_KOREAN:
     return USCRIPT_HANGUL;
   default:
     return 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) {
       UScriptCode code = static_cast<UScriptCode>(script);
       (*setter)(settings, it->second, GetScriptForWebSettings(code));
     }
   }
 }
 
 }  // namespace
@@ skipping 112 matching lines @@
       prefs.accelerated_compositing_for_video_enabled);
 
   // WebGL and accelerated 2D canvas are always gpu composited.
   settings->setAcceleratedCompositingForCanvasEnabled(
       prefs.experimental_webgl_enabled || prefs.accelerated_2d_canvas_enabled);
 
   settings->setAsynchronousSpellCheckingEnabled(
       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) {
     web_view->setInspectorSetting(WebString::fromUTF8(it->first),
                                   WebString::fromUTF8(it->second));
   }
 
   // Tabs to link is not part of the settings. WebCore calls
   // ChromeClient::tabsToLinks which is part of the glue code.
   web_view->setTabsToLinks(prefs.tabs_to_links);
@@ skipping 83 matching lines @@
   settings->setPinchVirtualViewportEnabled(
       prefs.pinch_virtual_viewport_enabled);
 
   settings->setPinchOverlayScrollbarThickness(
       prefs.pinch_overlay_scrollbar_thickness);
   settings->setUseSolidColorScrollbars(prefs.use_solid_color_scrollbars);
   settings->setCompositorTouchHitTesting(prefs.compositor_touch_hit_testing);
 }
 
 }  // namespace content