chrome side of merge from r41181 to r41217

DEPS

Index: DEPS
diff --git a/DEPS b/DEPS
index 621b6016abf82be6dd37fd5bca3965d6a8578e61..504f923e827245d67928c6a03a5b0defce2d7f46 100644
--- a/DEPS
+++ b/DEPS
@@ -1,90 +1,90 @@
-vars = {
-  "webkit_trunk":
-    "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "41181",
-}
-
-
-deps = {
-  "src/breakpad/src":
-    "http://google-breakpad.googlecode.com/svn/trunk/src@285",
-
-  "src/googleurl":
-    "http://google-url.googlecode.com/svn/trunk@96",
-
-  "src/sdch/open-vcdiff":
-    "http://open-vcdiff.googlecode.com/svn/trunk@22",
-
-  "src/testing/gtest":
-    "http://googletest.googlecode.com/svn/trunk@167",
-
-  "src/third_party/WebKit":
-    "/trunk/deps/third_party/WebKit@10283",
-
-  "src/third_party/icu38":
-    "/trunk/deps/third_party/icu38@10304",
-
-  # TODO(mark): Remove once this has moved into depot_tools.
-  "src/tools/gyp":
-    "http://gyp.googlecode.com/svn/trunk",
-
-  "src/v8":
-    "http://v8.googlecode.com/svn/trunk@1266",
-
-  "src/webkit/data/layout_tests/LayoutTests":
-    Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
-
-  "src/third_party/WebKit/WebKit/mac":
-    Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
-
-  "src/third_party/WebKit/WebKitLibraries":
-    Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
-}
-
-
-deps_os = {
-  "win": {
-    "src/third_party/cygwin":
-      "/trunk/deps/third_party/cygwin@3248",
-
-    "src/third_party/python_24":
-      "/trunk/deps/third_party/python_24@7444",
-
-    "src/third_party/svn":
-      "/trunk/deps/third_party/svn@3230",
-  },
-  "mac": {
-    "src/third_party/GTM":
-      "http://google-toolbox-for-mac.googlecode.com/svn/trunk/@77",
-    "src/third_party/pdfsqueeze":
-      "http://pdfsqueeze.googlecode.com/svn/trunk/@2",
-  },
-}
-
-
-include_rules = [
-  # Everybody can use some things.
-  "+base",
-  "+build",
-
-  # For now, we allow ICU to be included by specifying "unicode/...", although
-  # this should probably change.
-  "+unicode",
-  "+testing",
-
-  # Allow anybody to include files from the "public" Skia directory in the
-  # webkit port. This is shared between the webkit port and Chrome.
-  "+webkit/port/platform/graphics/skia/public",
-]
-
-
-# checkdeps.py shouldn't check include paths for files in these dirs:
-skip_child_includes = [
-   "breakpad",
-   "gears",
-   "sdch",
-   "skia",
-   "testing",
-   "third_party",
-   "v8",
-]
+vars = {
+  "webkit_trunk":
+    "http://svn.webkit.org/repository/webkit/trunk",
+  "webkit_revision": "41217",
+}
+
+
+deps = {
+  "src/breakpad/src":
+    "http://google-breakpad.googlecode.com/svn/trunk/src@285",
+
+  "src/googleurl":
+    "http://google-url.googlecode.com/svn/trunk@96",
+
+  "src/sdch/open-vcdiff":
+    "http://open-vcdiff.googlecode.com/svn/trunk@22",
+
+  "src/testing/gtest":
+    "http://googletest.googlecode.com/svn/trunk@167",
+
+  "src/third_party/WebKit":
+    "/trunk/deps/third_party/WebKit@10283",
+
+  "src/third_party/icu38":
+    "/trunk/deps/third_party/icu38@10304",
+
+  # TODO(mark): Remove once this has moved into depot_tools.
+  "src/tools/gyp":
+    "http://gyp.googlecode.com/svn/trunk",
+
+  "src/v8":
+    "http://v8.googlecode.com/svn/trunk@1266",
+
+  "src/webkit/data/layout_tests/LayoutTests":
+    Var("webkit_trunk") + "/LayoutTests@" + Var("webkit_revision"),
+
+  "src/third_party/WebKit/WebKit/mac":
+    Var("webkit_trunk") + "/WebKit/mac@" + Var("webkit_revision"),
+
+  "src/third_party/WebKit/WebKitLibraries":
+    Var("webkit_trunk") + "/WebKitLibraries@" + Var("webkit_revision"),
+}
+
+
+deps_os = {
+  "win": {
+    "src/third_party/cygwin":
+      "/trunk/deps/third_party/cygwin@3248",
+
+    "src/third_party/python_24":
+      "/trunk/deps/third_party/python_24@7444",
+
+    "src/third_party/svn":
+      "/trunk/deps/third_party/svn@3230",
+  },
+  "mac": {
+    "src/third_party/GTM":
+      "http://google-toolbox-for-mac.googlecode.com/svn/trunk/@77",
+    "src/third_party/pdfsqueeze":
+      "http://pdfsqueeze.googlecode.com/svn/trunk/@2",
+  },
+}
+
+
+include_rules = [
+  # Everybody can use some things.
+  "+base",
+  "+build",
+
+  # For now, we allow ICU to be included by specifying "unicode/...", although
+  # this should probably change.
+  "+unicode",
+  "+testing",
+
+  # Allow anybody to include files from the "public" Skia directory in the
+  # webkit port. This is shared between the webkit port and Chrome.
+  "+webkit/port/platform/graphics/skia/public",
+]
+
+
+# checkdeps.py shouldn't check include paths for files in these dirs:
+skip_child_includes = [
+   "breakpad",
+   "gears",
+   "sdch",
+   "skia",
+   "testing",
+   "third_party",
+   "v8",
+]