From 167c601f29b27cc15638b62098ad04b08d3d3868 Mon Sep 17 00:00:00 2001
From: Marshall Greenblatt <magreenblatt@gmail.com>
Date: Thu, 4 Oct 2012 19:17:45 +0000
Subject: [PATCH] Update to Chromium revision 160122.

git-svn-id: https://chromiumembedded.googlecode.com/svn/trunk@844 5089003a-bbd8-11dd-ad1f-f1f9622dbc98
---
 cef1/CHROMIUM_BUILD_COMPATIBILITY.txt | 2 +-
 cef1/libcef/browser_impl.cc           | 4 ++--
 cef1/libcef/browser_webkit_init.cc    | 1 -
 cef1/patch/patches/tools_gyp.patch    | 4 ++--
 4 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt b/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt
index d3a7e7d79..6f8fdef8c 100644
--- a/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/cef1/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -17,5 +17,5 @@
 
 {
   'chromium_url': 'http://src.chromium.org/svn/trunk/src',
-  'chromium_revision': '157509',
+  'chromium_revision': '160122',
 }
diff --git a/cef1/libcef/browser_impl.cc b/cef1/libcef/browser_impl.cc
index b94f35676..9f0173180 100644
--- a/cef1/libcef/browser_impl.cc
+++ b/cef1/libcef/browser_impl.cc
@@ -295,7 +295,7 @@ void CefBrowserImpl::GetFrameNames(std::vector<CefString>& names) {
   WebFrame* it = main_frame;
   do {
     if (it != main_frame) {
-      string16 str = it->name();
+      string16 str = it->uniqueName();
       names.push_back(str);
     }
     it = it->traverseNext(true);
@@ -688,7 +688,7 @@ CefRefPtr<CefFrame> CefBrowserImpl::UIT_GetCefFrame(WebFrame* frame) {
     cef_frame = GetMainCefFrame(frame->identifier(), url);
   } else {
     // Locate or create the appropriate reference.
-    CefString name = string16(frame->name());
+    CefString name = string16(frame->uniqueName());
     DCHECK(!name.empty());
     cef_frame = GetOrCreateCefFrame(frame->identifier(), name, url);
   }
diff --git a/cef1/libcef/browser_webkit_init.cc b/cef1/libcef/browser_webkit_init.cc
index f3d476629..c503b99b1 100644
--- a/cef1/libcef/browser_webkit_init.cc
+++ b/cef1/libcef/browser_webkit_init.cc
@@ -42,7 +42,6 @@ BrowserWebKitInit::BrowserWebKitInit()
   WebKit::WebRuntimeFeatures::enableSockets(true);
   WebKit::WebRuntimeFeatures::enableApplicationCache(true);
   WebKit::WebRuntimeFeatures::enableDatabase(true);
-  WebKit::WebRuntimeFeatures::enablePushState(true);
   WebKit::WebRuntimeFeatures::enableIndexedDatabase(true);
   WebKit::WebRuntimeFeatures::enableFileSystem(true);
   WebKit::WebRuntimeFeatures::enableGeolocation(true);
diff --git a/cef1/patch/patches/tools_gyp.patch b/cef1/patch/patches/tools_gyp.patch
index 71368ad84..525cf75d2 100644
--- a/cef1/patch/patches/tools_gyp.patch
+++ b/cef1/patch/patches/tools_gyp.patch
@@ -1,8 +1,8 @@
 Index: pylib/gyp/input.py
 ===================================================================
---- pylib/gyp/input.py	(revision 1501)
+--- pylib/gyp/input.py	(revision 1508)
 +++ pylib/gyp/input.py	(working copy)
-@@ -685,7 +685,8 @@
+@@ -824,7 +824,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.