Rebasing on Chromium 45

Fixing the minor differences needed to work with Chromium 45.

Change-Id: I5036b4b9a069d45e8dd37e24fab84cdfe5e67acc
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

2 files changed, 10 insertions, 5 deletions

diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 836d230e8..6746ff9c2 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -163,6 +163,7 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/cros_system_api')
         or file_path.startswith('third_party/cygwin')
         or file_path.startswith('third_party/cython')
+        or file_path.startswith('third_party/deqp')
         or file_path.startswith('third_party/elfutils')
         or file_path.startswith('third_party/google_input_tools')
         or file_path.startswith('third_party/gperf')
@@ -171,7 +172,7 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/google_appengine_cloudstorage')
         or file_path.startswith('third_party/google_toolbox_for_mac')
         or file_path.startswith('third_party/hunspell_dictionaries')
-        or file_path.startswith('third_party/hunspell_new')
+        or file_path.startswith('third_party/hunspell')
         or file_path.startswith('third_party/instrumented_libraries')
         or file_path.startswith('third_party/jsr-305/src')
         or file_path.startswith('third_party/junit')
@@ -185,14 +186,15 @@ def isInChromiumBlacklist(file_path):
         or file_path.startswith('third_party/mingw-w64')
         or file_path.startswith('third_party/nacl_sdk_binaries')
         or (file_path.startswith('third_party/polymer') and
-            not file_path.startswith('third_party/polymer/components-chromium/'))
+            not file_path.startswith('third_party/polymer/v1_0/components-chromium/'))
         or file_path.startswith('third_party/pdfsqueeze')
         or file_path.startswith('third_party/pefile')
         or file_path.startswith('third_party/perl')
         or file_path.startswith('third_party/pdfium')
         or file_path.startswith('third_party/psyco_win32')
         or file_path.startswith('third_party/scons-2.0.1')
-        or file_path.startswith('third_party/trace-viewer')
+        or file_path.startswith('third_party/trace-viewer/tracing/test_data')
+        or file_path.startswith('third_party/trace-viewer/tracing/third_party/v8')
         or file_path.startswith('third_party/undoview')
         or file_path.startswith('third_party/webgl')
         or (file_path.startswith('tools') and
@@ -209,9 +211,12 @@ def isInChromiumBlacklist(file_path):
            not file_path.startswith('tools/protoc_wrapper'))
         or file_path.startswith('ui/android/java')
         or file_path.startswith('ui/app_list')
+        or file_path.startswith('ui/base/ime/chromeos')
         or file_path.startswith('ui/chromeos')
         or file_path.startswith('ui/display/chromeos')
+        or file_path.startswith('ui/events/ozone/chromeos')
         or file_path.startswith('ui/file_manager')
+        or file_path.startswith('ui/gfx/chromeos')
 
         ):
             return True
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index b223e4fef..3e3f77d62 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -51,8 +51,8 @@ import json
 import urllib2
 import git_submodule as GitSubmodule
 
-chromium_version = '44.0.2403.91'
-chromium_branch = '2403'
+chromium_version = '45.0.2454.40'
+chromium_branch = '2454'
 ninja_version = 'v1.5.3'
 
 json_url = 'http://omahaproxy.appspot.com/all.json'