Update Chromium to version 40.0.2214.28 and ninja to 1.5.3.

* scoped_refptr operator for implicit conversion to pointer has
  been disabled upstream: https://codereview.chromium.org/510323002
* Group permission API as done upstream:
  https://codereview.chromium.org/622793002
* content_worker gyp target has been removed upstream.
* GetPageThumbnailData moved to DevToolsManagerDelegate.
* ui/ui_resources has been renamed to ui/resources
* WebPreferences and ResourceType have moved inside content.
* Merge ResourceBundle's InitSharedInstanceLocaleOnly with InitSharedInstanceWithLocale():
  https://codereview.chromium.org/457103003
* Remove obsolete accessibility events.
* AX_EVENT_SELECTED_TEXT_CHANGED has been renamed to AX_EVENT_TEXT_SELECTION_CHANGED
* AX_ROLE_MATH_ELEMENT was removed upstream. https://codereview.chromium.org/695133002
* Screen::IsDIPEnabled has been removed upstream. https://codereview.chromium.org/672823002
* Update DevToolsHttpHandlerDelegateQt according to ShellDevToolsManagerDelegate.
* Various functionality from DevToolsHttpHandler was moved to DevToolsManagerDelegate
  https://codereview.chromium.org/560323005
* DevToolsHttpHandler::Start expects a scoped_ptr now.
* Make sure event_factory_evdev.h is not included when USE_OZONE is not defined
* ErrorPageParams was moved into namespace error_page.
* Media Access is now handled by ContentBrowserClient::CheckMediaAccessPermission
* SpecialStoragePolicy moved to namespace storage
* Add implementation for new pure virtual function BrowserContext::GetSSLHostStateDelegate.
* RenderPass::Id was renamed to RenderPass::RenderPassId
* Include view_messages.h for ViewHostMsg_TextInputState_Param
* CERT_UNABLE_TO_CHECK_REVOCATION has been deprecated by Chromium:
  https://codereview.chromium.org/449743002
* MailboxManager::ConsumeTexture only takes the mailbox as an argument
* Replace RWHVQt::TextInputStateChanged with RWHVQt::TextInputTypeChanged.
* RenderWidgetHostView::ScrollOffsetChanged has been removed.
* SkBitmap::Config was removed upstream.
* CopyFromCompositingSurfaceCallback has become an own type.
* AcceleratedSurfaceInitialized only takes route_id as an argument.
* ServerBoundCertService has been renamed to ChannelIDService.
  Related API has been renamed accordingly.
* TextureImageTransportSurface was removed upstream.
* Update MediaCaptureDispatcher::OnMediaRequestStateChanged signature.
* AudioStream related functions are gone upstream.
  https://codereview.chromium.org/569713002
* Add implementation for RenderWidgetHostViewQt::GetLastScrollOffset.
* Include generic touch_device implementation.
* switches::kDisableDesktopNotifications was removed upstream.
  https://codereview.chromium.org/607843002
* PageTransition moved to ui.
* Messages headers are not guarded. Including them multiple times does hurt.
* ScaleGestureDetector does not create a standalone GestureDetector anymore.
  https://codereview.chromium.org/501503003
* MotionEvent::Cancel and Clone are not virtual anymore.
  https://codereview.chromium.org/502993004
* Exclude os_exchange_data_provider_mac from build.
* Remove argument from ScopedClipboardWriter ctor.
  https://codereview.chromium.org/558913003
* Remove ShowPopupMenu override from WebContentsQt.
  The function is not pure virtual anymore,
  and we never implemented any specifics.
* Do not use clang on desktop linux.
* Request functions in ContentBrowserClient
  were merged into RequestPermission.
* ninja: use configure.py --bootstrap instead of bootstrap.py

Change-Id: I3575612826db7845461a949b4e737264bb4e8d88
Reviewed-by: Pierre Rossi <pierre.rossi@theqtcompany.com>

3 files changed, 7 insertions, 4 deletions

diff --git a/tools/scripts/init-repository.py b/tools/scripts/init-repository.py
index 3425649ff..7c33ff01d 100755
--- a/tools/scripts/init-repository.py
+++ b/tools/scripts/init-repository.py
@@ -98,7 +98,7 @@ def updateLastChange():
 def initUpstreamSubmodules():
     ninja_url = 'https://github.com/martine/ninja.git'
     chromium_url = 'https://chromium.googlesource.com/chromium/src.git'
-    ninja_shasum = '7103c32646df958b0287c65b1c660bf528a191d6'
+    ninja_shasum = 'refs/tags/' + resolver.currentNinjaVersion()
     chromium_ref = 'refs/tags/' + resolver.currentVersion()
     os.chdir(qtwebengine_root)
 
diff --git a/tools/scripts/take_snapshot.py b/tools/scripts/take_snapshot.py
index 3db3bac6c..4a468d113 100755
--- a/tools/scripts/take_snapshot.py
+++ b/tools/scripts/take_snapshot.py
@@ -103,7 +103,6 @@ def isInChromiumBlacklist(file_path):
             not 'media/desktop_media_list.h' in file_path and
             not 'media/desktop_streams_registry.cc' in file_path and
             not 'media/desktop_streams_registry.h' in file_path and
-            not 'net/net_error_info' in file_path and
             not 'common/localized_error' in file_path and
             not file_path.endswith('cf_resources.rc') and
             not file_path.endswith('version.py') and
diff --git a/tools/scripts/version_resolver.py b/tools/scripts/version_resolver.py
index 2430555d9..d0ae1824e 100644
--- a/tools/scripts/version_resolver.py
+++ b/tools/scripts/version_resolver.py
@@ -51,8 +51,9 @@ import json
 import urllib2
 import git_submodule as GitSubmodule
 
-chromium_version = '37.0.2062.103'
-chromium_branch = '2062'
+chromium_version = '40.0.2214.28'
+chromium_branch = '2214'
+ninja_version = 'v1.5.3'
 
 json_url = 'http://omahaproxy.appspot.com/all.json'
 
@@ -73,6 +74,9 @@ sys.path.append(os.path.join(qtwebengine_root, 'tools', 'scripts'))
 def currentVersion():
     return chromium_version
 
+def currentNinjaVersion():
+    return ninja_version
+
 def readReleaseChannels():
     response = urllib2.urlopen(json_url)
     raw_json = response.read().strip()