Move webpreferences.* from webkit/ to content/

content/public/common/webpreferences.cc

Index: content/public/common/webpreferences.cc
diff --git a/webkit/common/webpreferences.cc b/content/public/common/webpreferences.cc
similarity index 76%
rename from webkit/common/webpreferences.cc
rename to content/public/common/webpreferences.cc
index a953f4a99aa1376ec2ac619806780a1e155bb4bd..fecf6bf7714000002e5807f17303092f573d2c06 100644
--- a/webkit/common/webpreferences.cc
+++ b/content/public/common/webpreferences.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/common/webpreferences.h"
+#include "content/public/common/webpreferences.h"
 
 #include "base/basictypes.h"
 #include "base/strings/string_util.h"
@@ -10,9 +10,27 @@
 #include "third_party/WebKit/public/web/WebSettings.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
 
-using base::ASCIIToWide;
 using blink::WebSettings;
 
+namespace content {
+
+// "Zyyy" is the ISO 15924 script code for undetermined script aka Common.
+const char kCommonScript[] = "Zyyy";
+
+#define COMPILE_ASSERT_MATCHING_ENUMS(content_name, blink_name)         \
+    COMPILE_ASSERT(                                                     \
+        static_cast<int>(content_name) == static_cast<int>(blink_name), \
+        mismatching_enums)
+
+COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_MAC,
+                              WebSettings::EditingBehaviorMac);
+COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_WIN,
+                              WebSettings::EditingBehaviorWin);
+COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_UNIX,
+                              WebSettings::EditingBehaviorUnix);
+COMPILE_ASSERT_MATCHING_ENUMS(EDITING_BEHAVIOR_ANDROID,
+                              WebSettings::EditingBehaviorAndroid);
+
 WebPreferences::WebPreferences()
     : default_font_size(16),
       default_fixed_font_size(13),
@@ -86,15 +104,15 @@ WebPreferences::WebPreferences()
       should_respect_image_orientation(false),
       number_of_cpu_cores(1),
 #if defined(OS_MACOSX)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_MAC),
+      editing_behavior(EDITING_BEHAVIOR_MAC),
 #elif defined(OS_WIN)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_WIN),
+      editing_behavior(EDITING_BEHAVIOR_WIN),
 #elif defined(OS_ANDROID)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_ANDROID),
+      editing_behavior(EDITING_BEHAVIOR_ANDROID),
 #elif defined(OS_POSIX)
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_UNIX),
+      editing_behavior(EDITING_BEHAVIOR_UNIX),
 #else
-      editing_behavior(webkit_glue::EDITING_BEHAVIOR_MAC),
+      editing_behavior(EDITING_BEHAVIOR_MAC),
 #endif
       supports_multiple_windows(true),
       viewport_enabled(false),
@@ -135,42 +153,18 @@ WebPreferences::WebPreferences()
       report_screen_size_in_physical_pixels_quirk(false)
 #endif
 {
-  standard_font_family_map[webkit_glue::kCommonScript] =
-      base::ASCIIToUTF16("Times New Roman");
-  fixed_font_family_map[webkit_glue::kCommonScript] =
-      base::ASCIIToUTF16("Courier New");
-  serif_font_family_map[webkit_glue::kCommonScript] =
+  standard_font_family_map[kCommonScript] =
       base::ASCIIToUTF16("Times New Roman");
-  sans_serif_font_family_map[webkit_glue::kCommonScript] =
-      base::ASCIIToUTF16("Arial");
-  cursive_font_family_map[webkit_glue::kCommonScript] =
-      base::ASCIIToUTF16("Script");
-  fantasy_font_family_map[webkit_glue::kCommonScript] =
-      base::ASCIIToUTF16("Impact");
-  pictograph_font_family_map[webkit_glue::kCommonScript] =
+  fixed_font_family_map[kCommonScript] = base::ASCIIToUTF16("Courier New");
+  serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Times New Roman");
+  sans_serif_font_family_map[kCommonScript] = base::ASCIIToUTF16("Arial");
+  cursive_font_family_map[kCommonScript] = base::ASCIIToUTF16("Script");
+  fantasy_font_family_map[kCommonScript] = base::ASCIIToUTF16("Impact");
+  pictograph_font_family_map[kCommonScript] =
       base::ASCIIToUTF16("Times New Roman");
 }
 
 WebPreferences::~WebPreferences() {
 }
 
-namespace webkit_glue {
-
-// "Zyyy" is the ISO 15924 script code for undetermined script aka Common.
-const char kCommonScript[] = "Zyyy";
-
-#define COMPILE_ASSERT_MATCHING_ENUMS(webkit_glue_name, webkit_name)         \
-    COMPILE_ASSERT(                                                          \
-        static_cast<int>(webkit_glue_name) == static_cast<int>(webkit_name), \
-        mismatching_enums)
-
-COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_MAC, WebSettings::EditingBehaviorMac);
-COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_WIN, WebSettings::EditingBehaviorWin);
-COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_UNIX, WebSettings::EditingBehaviorUnix);
-COMPILE_ASSERT_MATCHING_ENUMS(
-    webkit_glue::EDITING_BEHAVIOR_ANDROID, WebSettings::EditingBehaviorAndroid);
-
-}  // namespace webkit_glue
+}  // namespace content