Move webkit/common/webpreferences to content/public/common/

content/shell/common/webkit_test_helpers.cc

Index: content/shell/common/webkit_test_helpers.cc
diff --git a/content/shell/common/webkit_test_helpers.cc b/content/shell/common/webkit_test_helpers.cc
index f7c2ca305a173c042106812b8f454519f28bcfa2..fb7fd2266ce477b57e86b49076adfa24bf9763d6 100644
--- a/content/shell/common/webkit_test_helpers.cc
+++ b/content/shell/common/webkit_test_helpers.cc
@@ -9,9 +9,9 @@
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_switches.h"
+#include "content/public/common/webpreferences.h"
 #include "content/shell/common/shell_switches.h"
 #include "content/shell/common/test_runner/WebPreferences.h"
-#include "webkit/common/webpreferences.h"
 
 namespace content {
 
@@ -23,7 +23,7 @@ void ExportLayoutTestSpecificPreferences(
   to->dom_paste_enabled = from.DOMPasteAllowed;
   to->javascript_can_access_clipboard = from.javaScriptCanAccessClipboard;
   to->xss_auditor_enabled = from.XSSAuditorEnabled;
-  to->editing_behavior = static_cast<webkit_glue::EditingBehavior>(
+  to->editing_behavior = static_cast<content::EditingBehavior>(
       from.editingBehavior);
   to->default_font_size = from.defaultFontSize;
   to->minimum_font_size = from.minimumFontSize;
@@ -60,9 +60,9 @@ void ApplyLayoutTestDefaultPreferences(WebPreferences* prefs) {
   prefs->xslt_enabled = true;
   prefs->xss_auditor_enabled = false;
 #if defined(OS_MACOSX)
-  prefs->editing_behavior = webkit_glue::EDITING_BEHAVIOR_MAC;
+  prefs->editing_behavior = content::EDITING_BEHAVIOR_MAC;
 #else
-  prefs->editing_behavior = webkit_glue::EDITING_BEHAVIOR_WIN;
+  prefs->editing_behavior = content::EDITING_BEHAVIOR_WIN;
 #endif
   prefs->java_enabled = false;
   prefs->application_cache_enabled = true;
@@ -73,26 +73,26 @@ void ApplyLayoutTestDefaultPreferences(WebPreferences* prefs) {
   prefs->webgl_errors_to_console_enabled = false;
   base::string16 serif;
 #if defined(OS_MACOSX)
-  prefs->cursive_font_family_map[webkit_glue::kCommonScript] =
+  prefs->cursive_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Apple Chancery");
-  prefs->fantasy_font_family_map[webkit_glue::kCommonScript] =
+  prefs->fantasy_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Papyrus");
   serif = base::ASCIIToUTF16("Times");
 #else
-  prefs->cursive_font_family_map[webkit_glue::kCommonScript] =
+  prefs->cursive_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Comic Sans MS");
-  prefs->fantasy_font_family_map[webkit_glue::kCommonScript] =
+  prefs->fantasy_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Impact");
   serif = base::ASCIIToUTF16("times new roman");
 #endif
-  prefs->serif_font_family_map[webkit_glue::kCommonScript] =
+  prefs->serif_font_family_map[content::kCommonScript] =
       serif;
-  prefs->standard_font_family_map[webkit_glue::kCommonScript] =
+  prefs->standard_font_family_map[content::kCommonScript] =
       serif;
-  prefs->fixed_font_family_map[webkit_glue::kCommonScript] =
+  prefs->fixed_font_family_map[content::kCommonScript] =
       base::ASCIIToUTF16("Courier");
   prefs->sans_serif_font_family_map[
-      webkit_glue::kCommonScript] = base::ASCIIToUTF16("Helvetica");
+      content::kCommonScript] = base::ASCIIToUTF16("Helvetica");
   prefs->minimum_logical_font_size = 9;
   prefs->asynchronous_spell_checking_enabled = false;
   prefs->threaded_html_parser = true;