From 10a336e5001e09a5cf4f1698f17c8847324e4928 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Tue, 1 May 2012 17:47:54 +0000
Subject: [PATCH] Update to Chromium revision 134688.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@612 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 CHROMIUM_BUILD_COMPATIBILITY.txt             | 2 +-
 libcef/browser/url_request_context_getter.cc | 9 +++++----
 patch/patches/tools_gyp.patch                | 8 ++++----
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt
index adee1e7d2..d31d9b812 100644
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -17,5 +17,5 @@
 
 {
   'chromium_url': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_revision': '133962',
+  'chromium_revision': '134688',
 }
diff --git a/libcef/browser/url_request_context_getter.cc b/libcef/browser/url_request_context_getter.cc
index f7418c4c0..637d0882a 100644
--- a/libcef/browser/url_request_context_getter.cc
+++ b/libcef/browser/url_request_context_getter.cc
@@ -257,15 +257,16 @@ net::URLRequestContext* CefURLRequestContextGetter::GetURLRequestContext() {
         url_request_context_->host_resolver(),
         url_request_context_->cert_verifier(),
         url_request_context_->server_bound_cert_service(),
-        NULL,  // tranport_security_state
+        NULL,  /* tranport_security_state */
         url_request_context_->proxy_service(),
-        "",  // ssl_session_cache_shard
+        "",  /* ssl_session_cache_shard */
         url_request_context_->ssl_config_service(),
         url_request_context_->http_auth_handler_factory(),
-        NULL,  // network_delegate
+        NULL,  /* network_delegate */
         url_request_context_->http_server_properties(),
         NULL,
-        main_backend);
+        main_backend,
+        ""  /* trusted_spdy_proxy */);
     storage_->set_http_transaction_factory(main_cache);
 
     storage_->set_ftp_transaction_factory(
diff --git a/patch/patches/tools_gyp.patch b/patch/patches/tools_gyp.patch
index 2a8fdfa22..195a07f62 100644
--- a/patch/patches/tools_gyp.patch
+++ b/patch/patches/tools_gyp.patch
@@ -1,8 +1,8 @@
-Index: pylib/gyp/input.py
+Index: gyp/input.py
 ===================================================================
---- pylib/gyp/input.py	(revision 1107)
-+++ pylib/gyp/input.py	(working copy)
-@@ -666,7 +666,8 @@
+--- gyp/input.py	(revision 1344)
++++ gyp/input.py	(working copy)
+@@ -683,7 +683,8 @@
              # that don't load quickly, this can be faster than
              # <!(python modulename param eters). Do this in |build_file_dir|.
              oldwd = os.getcwd()  # Python doesn't like os.open('.'): no fchdir.