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>

1 files changed, 12 insertions, 12 deletions

diff --git a/src/core/network_delegate_qt.cpp b/src/core/network_delegate_qt.cpp
index f14d2cb39..fce563b47 100644
--- a/src/core/network_delegate_qt.cpp
+++ b/src/core/network_delegate_qt.cpp
@@ -40,7 +40,7 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/resource_request_info.h"
-#include "content/public/common/page_transition_types.h"
+#include "ui/base/page_transition_types.h"
 #include "net/base/load_flags.h"
 #include "net/url_request/url_request.h"
 #include "type_conversion.h"
@@ -49,23 +49,23 @@
 
 namespace {
 
-int pageTransitionToNavigationType(content::PageTransition transition)
+int pageTransitionToNavigationType(ui::PageTransition transition)
 {
-    int32 qualifier = content::PageTransitionGetQualifier(transition);
+    int32 qualifier = ui::PageTransitionGetQualifier(transition);
 
-    if (qualifier & content::PAGE_TRANSITION_FORWARD_BACK)
+    if (qualifier & ui::PAGE_TRANSITION_FORWARD_BACK)
         return WebContentsAdapterClient::BackForwardNavigation;
 
-    content::PageTransition stippedTransition = content::PageTransitionStripQualifier(transition);
+    ui::PageTransition stippedTransition = ui::PageTransitionStripQualifier(transition);
 
     switch (stippedTransition) {
-    case content::PAGE_TRANSITION_LINK:
+    case ui::PAGE_TRANSITION_LINK:
         return WebContentsAdapterClient::LinkClickedNavigation;
-    case content::PAGE_TRANSITION_TYPED:
+    case ui::PAGE_TRANSITION_TYPED:
         return WebContentsAdapterClient::TypedNavigation;
-    case content::PAGE_TRANSITION_FORM_SUBMIT:
+    case ui::PAGE_TRANSITION_FORM_SUBMIT:
         return WebContentsAdapterClient::FormSubmittedNavigation;
-    case content::PAGE_TRANSITION_RELOAD:
+    case ui::PAGE_TRANSITION_RELOAD:
         return WebContentsAdapterClient::ReloadNavigation;
     default:
         return WebContentsAdapterClient::OtherNavigation;
@@ -84,9 +84,9 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
         // Abort the request if it has no associated render info / render view.
         return net::ERR_ABORTED;
 
-    ResourceType::Type resourceType = info->GetResourceType();
+    content::ResourceType resourceType = info->GetResourceType();
     // Only intercept MAIN_FRAME and SUB_FRAME.
-    if (!ResourceType::IsFrame(resourceType))
+    if (!content::IsResourceTypeFrame(resourceType))
         return net::OK;
 
     // Track active requests since |callback| and |new_url| are valid
@@ -97,7 +97,7 @@ int NetworkDelegateQt::OnBeforeURLRequest(net::URLRequest *request, const net::C
 
     RequestParams params = {
         toQt(request->url()),
-        resourceType == ResourceType::MAIN_FRAME,
+        info->IsMainFrame(),
         navigationType,
         renderProcessId,
         renderFrameId