diff --git a/CHROMIUM_BUILD_COMPATIBILITY.txt b/CHROMIUM_BUILD_COMPATIBILITY.txt
index 117d26bb1..8520e2b81 100644
--- a/CHROMIUM_BUILD_COMPATIBILITY.txt
+++ b/CHROMIUM_BUILD_COMPATIBILITY.txt
@@ -7,5 +7,5 @@
 # https://code.google.com/p/chromiumembedded/wiki/BranchesAndBuilding
 
 {
-  'chromium_checkout': 'b0aa1fb52e46b9c6580227c856ec4e063bb57799',
+  'chromium_checkout': '267aeeb8d85c8503a7fd12bd14654b8ea78d3974',
 }
diff --git a/cef.gyp b/cef.gyp
index 7be2baaec..a3547d892 100644
--- a/cef.gyp
+++ b/cef.gyp
@@ -737,7 +737,7 @@
           'variables': {
             'pak_inputs': [
               '<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',
-              '<(SHARED_INTERMEDIATE_DIR)/components/component_resources.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/components/components_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.pak',
               '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.pak',
               '<(grit_out_dir)/cef_resources.pak',
@@ -750,7 +750,7 @@
           'action_name': 'repack_cef_100_percent_pack',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_100_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_100_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
             ],
@@ -762,7 +762,7 @@
           'action_name': 'repack_cef_200_percent_pack',
           'variables': {
             'pak_inputs': [
-              '<(SHARED_INTERMEDIATE_DIR)/components/component_resources_200_percent.pak',
+              '<(SHARED_INTERMEDIATE_DIR)/components/components_resources_200_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/content/app/resources/content_resources_200_percent.pak',
               '<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_200_percent.pak',
             ],
diff --git a/libcef/browser/browser_host_impl.cc b/libcef/browser/browser_host_impl.cc
index 70811e86b..7567b809f 100644
--- a/libcef/browser/browser_host_impl.cc
+++ b/libcef/browser/browser_host_impl.cc
@@ -1972,7 +1972,6 @@ void CefBrowserHostImpl::CloseContents(content::WebContents* source) {
 }
 
 void CefBrowserHostImpl::UpdateTargetURL(content::WebContents* source,
-                                         int32 page_id,
                                          const GURL& url) {
   if (client_.get()) {
     CefRefPtr<CefDisplayHandler> handler = client_->GetDisplayHandler();
diff --git a/libcef/browser/browser_host_impl.h b/libcef/browser/browser_host_impl.h
index 1ab569d60..cc621f709 100644
--- a/libcef/browser/browser_host_impl.h
+++ b/libcef/browser/browser_host_impl.h
@@ -343,7 +343,6 @@ class CefBrowserHostImpl : public CefBrowserHost,
                                    bool to_different_document) OVERRIDE;
   virtual void CloseContents(content::WebContents* source) OVERRIDE;
   virtual void UpdateTargetURL(content::WebContents* source,
-                               int32 page_id,
                                const GURL& url) OVERRIDE;
   virtual bool AddMessageToConsole(content::WebContents* source,
                                    int32 level,
diff --git a/libcef/browser/render_widget_host_view_osr.cc b/libcef/browser/render_widget_host_view_osr.cc
index 3eda4caa7..949bc02d2 100644
--- a/libcef/browser/render_widget_host_view_osr.cc
+++ b/libcef/browser/render_widget_host_view_osr.cc
@@ -624,6 +624,13 @@ content::BrowserAccessibilityManager*
   return NULL;
 }
 
+#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
+void CefRenderWidgetHostViewOSR::ShowDisambiguationPopup(
+    const gfx::Rect& rect_pixels,
+    const SkBitmap& zoomed_bitmap) {
+}
+#endif
+
 #if !defined(OS_MACOSX) && defined(USE_AURA)
 void CefRenderWidgetHostViewOSR::ImeCompositionRangeChanged(
     const gfx::Range& range,
diff --git a/libcef/browser/render_widget_host_view_osr.h b/libcef/browser/render_widget_host_view_osr.h
index 0eef3fd4c..94a42f599 100644
--- a/libcef/browser/render_widget_host_view_osr.h
+++ b/libcef/browser/render_widget_host_view_osr.h
@@ -171,6 +171,11 @@ class CefRenderWidgetHostViewOSR
       CreateBrowserAccessibilityManager(
           content::BrowserAccessibilityDelegate* delegate) OVERRIDE;
 
+#if defined(TOOLKIT_VIEWS) || defined(USE_AURA)
+  virtual void ShowDisambiguationPopup(const gfx::Rect& rect_pixels,
+                                       const SkBitmap& zoomed_bitmap) OVERRIDE;
+#endif
+
 #if defined(OS_MACOSX)
   virtual bool PostProcessEventForPluginIme(
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
diff --git a/patch/patch.cfg b/patch/patch.cfg
index 53fe0d406..82d650115 100644
--- a/patch/patch.cfg
+++ b/patch/patch.cfg
@@ -111,12 +111,6 @@ patches = [
     'name': 'printing_win',
     'path': '../',
   },
-  {
-    # Fix crash in Scheduler::swapQueuesRunPendingTasks...()
-    # http://crbug.com/415478
-    'name': 'renderer_415478',
-    'path': '../content/renderer/',
-  },
   {
     # Fix AtExitManager assertion on SpellcheckServiceFactory destruction during
     # Windows multi-threaded message loop shutdown.
diff --git a/patch/patches/browser_1161.patch b/patch/patches/browser_1161.patch
index 7672b3783..f96ea2e3a 100644
--- a/patch/patches/browser_1161.patch
+++ b/patch/patches/browser_1161.patch
@@ -1,17 +1,16 @@
 diff --git compositor/io_surface_layer_mac.mm compositor/io_surface_layer_mac.mm
-index bdb3abf..523d372 100644
+index 357c65e..371e3c4 100644
 --- compositor/io_surface_layer_mac.mm
 +++ compositor/io_surface_layer_mac.mm
-@@ -435,7 +435,7 @@ void IOSurfaceLayerHelper::TimerFired() {
-         logging::LOG_ERROR,
-         "IOSurfaceLayer",
-         std::string("No texture to draw, clearing to white"));
+@@ -295,7 +295,7 @@ void IOSurfaceLayerHelper::EndPumpingFrames() {
+   TRACE_EVENT0("browser", "IOSurfaceLayer::drawInCGLContext");
+ 
+   if (!iosurface_->HasIOSurface() || context_->cgl_context() != glContext) {
 -    glClearColor(1, 1, 1, 1);
 +    glClearColor(0, 0, 0, 0);
      glClear(GL_COLOR_BUFFER_BIT);
+     return;
    }
- 
-
 diff --git renderer_host/compositing_iosurface_mac.mm renderer_host/compositing_iosurface_mac.mm
 index ba67fc9..2c6a410 100644
 --- renderer_host/compositing_iosurface_mac.mm
@@ -26,10 +25,10 @@ index ba67fc9..2c6a410 100644
    }
  
 diff --git renderer_host/render_widget_host_view_aura.cc renderer_host/render_widget_host_view_aura.cc
-index a59880e..e57a421 100644
+index 6ad6e41..9f33679 100644
 --- renderer_host/render_widget_host_view_aura.cc
 +++ renderer_host/render_widget_host_view_aura.cc
-@@ -1622,8 +1622,14 @@ void RenderWidgetHostViewAura::OnPaint(gfx::Canvas* canvas) {
+@@ -1706,8 +1706,14 @@ void RenderWidgetHostViewAura::OnPaint(gfx::Canvas* canvas) {
    // For non-opaque windows, we don't draw anything, since we depend on the
    // canvas coming from the compositor to already be initialized as
    // transparent.
diff --git a/patch/patches/browser_web_contents_1257.patch b/patch/patches/browser_web_contents_1257.patch
index 38c302414..5a9dd7d07 100644
--- a/patch/patches/browser_web_contents_1257.patch
+++ b/patch/patches/browser_web_contents_1257.patch
@@ -1,5 +1,5 @@
 diff --git web_contents_impl.cc web_contents_impl.cc
-index 592a72a..caf9331 100644
+index b6ff810..e783922 100644
 --- web_contents_impl.cc
 +++ web_contents_impl.cc
 @@ -1195,22 +1195,29 @@ void WebContentsImpl::Init(const WebContents::CreateParams& params) {
diff --git a/patch/patches/build.patch b/patch/patches/build.patch
index 2ebe0f6ac..54c134d59 100644
--- a/patch/patches/build.patch
+++ b/patch/patches/build.patch
@@ -1,5 +1,5 @@
 diff --git common.gypi common.gypi
-index d00b6a7..42c6469 100644
+index dc0f525..fb1889c 100644
 --- common.gypi
 +++ common.gypi
 @@ -9,6 +9,9 @@
@@ -12,7 +12,7 @@ index d00b6a7..42c6469 100644
      # Putting a variables dict inside another variables dict looks kind of
      # weird.  This is done so that 'host_arch', 'chromeos', etc are defined as
      # variables within the outer variables dict here.  This is necessary
-@@ -5390,6 +5393,9 @@
+@@ -5391,6 +5394,9 @@
            4510, # Default constructor could not be generated
            4512, # Assignment operator could not be generated
            4610, # Object can never be instantiated
diff --git a/patch/patches/content_nav_1129.patch b/patch/patches/content_nav_1129.patch
index 3256199d1..b4a16c60c 100644
--- a/patch/patches/content_nav_1129.patch
+++ b/patch/patches/content_nav_1129.patch
@@ -39,10 +39,10 @@ index 55db98c..8f155d6 100644
    // Returns true if we should fork a new process for the given navigation.
    // If |send_referrer| is set to false (which is the default), no referrer
 diff --git renderer/render_frame_impl.cc renderer/render_frame_impl.cc
-index 6337743..4d3f3f9 100644
+index fcea3a1..f1f1df3 100644
 --- renderer/render_frame_impl.cc
 +++ renderer/render_frame_impl.cc
-@@ -3491,7 +3491,6 @@ void RenderFrameImpl::FocusedNodeChanged(const WebNode& node) {
+@@ -3468,7 +3468,6 @@ void RenderFrameImpl::FocusedNodeChanged(const WebNode& node) {
  WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
      RenderFrame* render_frame,
      const NavigationPolicyInfo& info) {
@@ -50,7 +50,7 @@ index 6337743..4d3f3f9 100644
    // The handlenavigation API is deprecated and will be removed once
    // crbug.com/325351 is resolved.
    if (info.urlRequest.url() != GURL(kSwappedOutURL) &&
-@@ -3506,7 +3505,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
+@@ -3483,7 +3482,6 @@ WebNavigationPolicy RenderFrameImpl::DecidePolicyForNavigation(
            info.isRedirect)) {
      return blink::WebNavigationPolicyIgnore;
    }
diff --git a/patch/patches/gritsettings.patch b/patch/patches/gritsettings.patch
index 8c8ac0fb8..ca2b67d33 100644
--- a/patch/patches/gritsettings.patch
+++ b/patch/patches/gritsettings.patch
@@ -1,8 +1,8 @@
 diff --git resource_ids resource_ids
-index 9cd707c..5bb858c 100644
+index c4a6337..127433b 100644
 --- resource_ids
 +++ resource_ids
-@@ -16,6 +16,12 @@
+@@ -14,6 +14,12 @@
  {
    "SRCDIR": "../..",
  
diff --git a/patch/patches/prefs_content_1161.patch b/patch/patches/prefs_content_1161.patch
index fc166dad9..28346f02d 100644
--- a/patch/patches/prefs_content_1161.patch
+++ b/patch/patches/prefs_content_1161.patch
@@ -35,10 +35,10 @@ index b0a95ca..8c0781e 100644
    bool v8_script_streaming_enabled;
  
 diff --git renderer/render_view_impl.cc renderer/render_view_impl.cc
-index 02d10eef..ba5cf0c 100644
+index b931da5..73b30b4 100644
 --- renderer/render_view_impl.cc
 +++ renderer/render_view_impl.cc
-@@ -969,6 +969,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
+@@ -971,6 +971,8 @@ void RenderView::ApplyWebPreferences(const WebPreferences& prefs,
  
    settings->setJavaEnabled(prefs.java_enabled);
  
diff --git a/patch/patches/printing_win.patch b/patch/patches/printing_win.patch
index b5b40ca38..a6429138d 100644
--- a/patch/patches/printing_win.patch
+++ b/patch/patches/printing_win.patch
@@ -100,7 +100,7 @@ index d5ddd6e..7d90287 100644
 +                     double /* scale_factor */)
 +#endif  // ENABLE_PRINTING && OS_WIN
 diff --git content/renderer/pepper/pepper_plugin_instance_impl.cc content/renderer/pepper/pepper_plugin_instance_impl.cc
-index 98ca698..2128d55 100644
+index 1a57335..4414095 100644
 --- content/renderer/pepper/pepper_plugin_instance_impl.cc
 +++ content/renderer/pepper/pepper_plugin_instance_impl.cc
 @@ -94,9 +94,7 @@
@@ -172,7 +172,7 @@ index 98ca698..2128d55 100644
  namespace {
  
  // Check PP_TextInput_Type and ui::TextInputType are kept in sync.
-@@ -1776,7 +1739,7 @@ int PepperPluginInstanceImpl::PrintBegin(const WebPrintParams& print_params) {
+@@ -1782,7 +1745,7 @@ int PepperPluginInstanceImpl::PrintBegin(const WebPrintParams& print_params) {
  
  bool PepperPluginInstanceImpl::PrintPage(int page_number,
                                           blink::WebCanvas* canvas) {
@@ -181,7 +181,7 @@ index 98ca698..2128d55 100644
    DCHECK(plugin_print_interface_);
    PP_PrintPageNumberRange_Dev page_range;
    page_range.first_page_number = page_range.last_page_number = page_number;
-@@ -1793,7 +1756,7 @@ bool PepperPluginInstanceImpl::PrintPage(int page_number,
+@@ -1799,7 +1762,7 @@ bool PepperPluginInstanceImpl::PrintPage(int page_number,
    } else {
      return PrintPageHelper(&page_range, 1, canvas);
    }
@@ -190,7 +190,7 @@ index 98ca698..2128d55 100644
    return false;
  #endif
  }
-@@ -1960,7 +1923,7 @@ bool PepperPluginInstanceImpl::IsViewAccelerated() {
+@@ -1966,7 +1929,7 @@ bool PepperPluginInstanceImpl::IsViewAccelerated() {
  
  bool PepperPluginInstanceImpl::PrintPDFOutput(PP_Resource print_output,
                                                blink::WebCanvas* canvas) {
@@ -199,7 +199,7 @@ index 98ca698..2128d55 100644
    ppapi::thunk::EnterResourceNoLock<PPB_Buffer_API> enter(print_output, true);
    if (enter.failed())
      return false;
-@@ -1970,91 +1933,15 @@ bool PepperPluginInstanceImpl::PrintPDFOutput(PP_Resource print_output,
+@@ -1976,91 +1939,15 @@ bool PepperPluginInstanceImpl::PrintPDFOutput(PP_Resource print_output,
      NOTREACHED();
      return false;
    }
diff --git a/patch/patches/public_browser_1161_1257.patch b/patch/patches/public_browser_1161_1257.patch
index c9051f149..a8e7bcebb 100644
--- a/patch/patches/public_browser_1161_1257.patch
+++ b/patch/patches/public_browser_1161_1257.patch
@@ -89,7 +89,7 @@ index 4f0d625..01083ac 100644
  
    // Creates a new WebContents.
 diff --git web_contents_delegate.cc web_contents_delegate.cc
-index 72cabb4..32765ba 100644
+index f264df7..bded79a 100644
 --- web_contents_delegate.cc
 +++ web_contents_delegate.cc
 @@ -136,7 +136,9 @@ bool WebContentsDelegate::ShouldCreateWebContents(
@@ -104,7 +104,7 @@ index 72cabb4..32765ba 100644
  }
  
 diff --git web_contents_delegate.h web_contents_delegate.h
-index 457b3c0..734fc87 100644
+index 2cfcdf7..7adde8e 100644
 --- web_contents_delegate.h
 +++ web_contents_delegate.h
 @@ -36,9 +36,11 @@ class DownloadItem;
@@ -119,7 +119,7 @@ index 457b3c0..734fc87 100644
  struct ColorSuggestion;
  struct ContextMenuParams;
  struct DropData;
-@@ -314,7 +316,9 @@ class CONTENT_EXPORT WebContentsDelegate {
+@@ -313,7 +315,9 @@ class CONTENT_EXPORT WebContentsDelegate {
        const base::string16& frame_name,
        const GURL& target_url,
        const std::string& partition_id,
diff --git a/patch/patches/spellcheck_137.patch b/patch/patches/spellcheck_137.patch
index 07949c069..f5339541f 100644
--- a/patch/patches/spellcheck_137.patch
+++ b/patch/patches/spellcheck_137.patch
@@ -1,5 +1,5 @@
 diff --git spellcheck_factory.cc spellcheck_factory.cc
-index 8df78f4..33e4201e 100644
+index 8df78f4..909840e 100644
 --- spellcheck_factory.cc
 +++ spellcheck_factory.cc
 @@ -14,6 +14,13 @@
diff --git a/patch/patches/spi_webcore_364.patch b/patch/patches/spi_webcore_364.patch
index 627067493..f1caadd42 100644
--- a/patch/patches/spi_webcore_364.patch
+++ b/patch/patches/spi_webcore_364.patch
@@ -1,8 +1,8 @@
 diff --git core/frame/FrameView.cpp core/frame/FrameView.cpp
-index db086a2..3bcc736 100644
+index 3a1981b..95cb146 100644
 --- core/frame/FrameView.cpp
 +++ core/frame/FrameView.cpp
-@@ -128,8 +128,10 @@ FrameView::FrameView(LocalFrame* frame)
+@@ -129,8 +129,10 @@ FrameView::FrameView(LocalFrame* frame)
      if (!m_frame->isMainFrame())
          return;
  
diff --git a/patch/patches/views_widget_180.patch b/patch/patches/views_widget_180.patch
index b3c47bd7e..f561c3efe 100644
--- a/patch/patches/views_widget_180.patch
+++ b/patch/patches/views_widget_180.patch
@@ -26,7 +26,7 @@ index f4c03da..bb253cf 100644
    //
    // You'd think we'd be able to just call window->GetBoundsInScreen(), but we
 diff --git desktop_aura/desktop_window_tree_host_win.cc desktop_aura/desktop_window_tree_host_win.cc
-index 84ff9e6..4464b8d 100644
+index d184ae4..92ffd42 100644
 --- desktop_aura/desktop_window_tree_host_win.cc
 +++ desktop_aura/desktop_window_tree_host_win.cc
 @@ -131,7 +131,9 @@ void DesktopWindowTreeHostWin::Init(aura::Window* content_window,
@@ -40,7 +40,7 @@ index 84ff9e6..4464b8d 100644
      parent_hwnd = params.parent->GetHost()->GetAcceleratedWidget();
  
    message_handler_->set_remove_standard_frame(params.remove_standard_frame);
-@@ -814,6 +816,7 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
+@@ -822,6 +824,7 @@ void DesktopWindowTreeHostWin::HandleFrameChanged() {
  
  void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
    // TODO(beng): inform the native_widget_delegate_.
@@ -48,7 +48,7 @@ index 84ff9e6..4464b8d 100644
    InputMethod* input_method = GetInputMethod();
    if (input_method)
      input_method->OnFocus();
-@@ -821,6 +824,7 @@ void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
+@@ -829,6 +832,7 @@ void DesktopWindowTreeHostWin::HandleNativeFocus(HWND last_focused_window) {
  
  void DesktopWindowTreeHostWin::HandleNativeBlur(HWND focused_window) {
    // TODO(beng): inform the native_widget_delegate_.
@@ -57,15 +57,15 @@ index 84ff9e6..4464b8d 100644
    if (input_method)
      input_method->OnBlur();
 diff --git desktop_aura/desktop_window_tree_host_x11.cc desktop_aura/desktop_window_tree_host_x11.cc
-index 15c51a0..7d2503d 100644
+index 9831992..081a56a0 100644
 --- desktop_aura/desktop_window_tree_host_x11.cc
 +++ desktop_aura/desktop_window_tree_host_x11.cc
 @@ -147,7 +147,8 @@ DesktopWindowTreeHostX11::DesktopWindowTreeHostX11(
-       window_parent_(NULL),
        window_shape_(NULL),
        custom_window_shape_(false),
--      urgency_hint_set_(false) {
-+      urgency_hint_set_(false),
+       urgency_hint_set_(false),
+-      close_widget_factory_(this) {
++      close_widget_factory_(this),
 +      xwindow_destroyed_(false) {
  }
  
@@ -98,7 +98,7 @@ index 15c51a0..7d2503d 100644
    return bounds_;
  }
  
-@@ -929,6 +935,8 @@ void DesktopWindowTreeHostX11::SetBounds(const gfx::Rect& requested_bounds) {
+@@ -933,6 +939,8 @@ void DesktopWindowTreeHostX11::SetBounds(const gfx::Rect& requested_bounds) {
  }
  
  gfx::Point DesktopWindowTreeHostX11::GetLocationOnNativeScreen() const {
@@ -107,7 +107,7 @@ index 15c51a0..7d2503d 100644
    return bounds_.origin();
  }
  
-@@ -1081,10 +1089,14 @@ void DesktopWindowTreeHostX11::InitX11Window(
+@@ -1085,10 +1093,14 @@ void DesktopWindowTreeHostX11::InitX11Window(
      }
    }
  
@@ -123,7 +123,7 @@ index 15c51a0..7d2503d 100644
        bounds_.x(), bounds_.y(),
        bounds_.width(), bounds_.height(),
        0,               // border width
-@@ -1702,6 +1714,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
+@@ -1706,6 +1718,10 @@ uint32_t DesktopWindowTreeHostX11::DispatchEvent(
        }
        break;
      }
@@ -135,7 +135,7 @@ index 15c51a0..7d2503d 100644
        if (xev->xfocus.mode != NotifyGrab) {
          ReleaseCapture();
 diff --git desktop_aura/desktop_window_tree_host_x11.h desktop_aura/desktop_window_tree_host_x11.h
-index 12bd9a1..8191a25 100644
+index 8a5e51f..4d5a777 100644
 --- desktop_aura/desktop_window_tree_host_x11.h
 +++ desktop_aura/desktop_window_tree_host_x11.h
 @@ -85,6 +85,8 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
@@ -147,7 +147,7 @@ index 12bd9a1..8191a25 100644
   protected:
    // Overridden from DesktopWindowTreeHost:
    virtual void Init(aura::Window* content_window,
-@@ -257,6 +259,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
+@@ -256,6 +258,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
    // The bounds of |xwindow_|.
    gfx::Rect bounds_;
  
@@ -157,9 +157,9 @@ index 12bd9a1..8191a25 100644
    // Whenever the bounds are set, we keep the previous set of bounds around so
    // we can have a better chance of getting the real |restored_bounds_|. Window
    // managers tend to send a Configure message with the maximized bounds, and
-@@ -339,6 +344,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
+@@ -340,6 +345,9 @@ class VIEWS_EXPORT DesktopWindowTreeHostX11
  
-   base::CancelableCallback<void()> delayed_resize_task_;
+   base::WeakPtrFactory<DesktopWindowTreeHostX11> close_widget_factory_;
  
 +  // True if the xwindow has already been destroyed.
 +  bool xwindow_destroyed_;
diff --git a/patch/patches/webkit_popups.patch b/patch/patches/webkit_popups.patch
index 20ebee730..eae7e0c5c 100644
--- a/patch/patches/webkit_popups.patch
+++ b/patch/patches/webkit_popups.patch
@@ -12,10 +12,10 @@ index ee5bdbe..919addf 100644
  
      return adoptRefWillBeNoop(new PopupMenuChromium(frame, client));
 diff --git Source/web/WebViewImpl.cpp Source/web/WebViewImpl.cpp
-index 82d447b..971e3aa 100644
+index c9ca40a..9cff683 100644
 --- Source/web/WebViewImpl.cpp
 +++ Source/web/WebViewImpl.cpp
-@@ -388,6 +388,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
+@@ -386,6 +386,7 @@ WebViewImpl::WebViewImpl(WebViewClient* client)
      , m_fakePageScaleAnimationPageScaleFactor(0)
      , m_fakePageScaleAnimationUseAnchor(false)
      , m_contextMenuAllowed(false)
@@ -23,7 +23,7 @@ index 82d447b..971e3aa 100644
      , m_doingDragAndDrop(false)
      , m_ignoreInputEvents(false)
      , m_compositorDeviceScaleFactorOverride(0)
-@@ -3893,9 +3894,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
+@@ -3919,9 +3920,14 @@ void WebViewImpl::deviceOrPageScaleFactorChanged()
      m_page->inspectorController().deviceOrPageScaleFactorChanged();
  }
  
@@ -40,10 +40,10 @@ index 82d447b..971e3aa 100644
  
  void WebViewImpl::startDragging(LocalFrame* frame,
 diff --git Source/web/WebViewImpl.h Source/web/WebViewImpl.h
-index 988352c..81102f1 100644
+index 9bd645b..5da0cae 100644
 --- Source/web/WebViewImpl.h
 +++ Source/web/WebViewImpl.h
-@@ -368,7 +368,8 @@ public:
+@@ -372,7 +372,8 @@ public:
  
      // Returns true if popup menus should be rendered by the browser, false if
      // they should be rendered by WebKit (which is the default).
@@ -53,7 +53,7 @@ index 988352c..81102f1 100644
  
      bool contextMenuAllowed() const
      {
-@@ -654,6 +655,8 @@ private:
+@@ -660,6 +661,8 @@ private:
  
      bool m_contextMenuAllowed;
  
@@ -63,10 +63,10 @@ index 988352c..81102f1 100644
  
      bool m_ignoreInputEvents;
 diff --git public/web/WebView.h public/web/WebView.h
-index db4c090..89ae86d 100644
+index 8ff8487..f65d350 100644
 --- public/web/WebView.h
 +++ public/web/WebView.h
-@@ -412,6 +412,7 @@ public:
+@@ -405,6 +405,7 @@ public:
  
      // Sets whether select popup menus should be rendered by the browser.
      BLINK_EXPORT static void setUseExternalPopupMenus(bool);
diff --git a/tests/unittests/request_unittest.cc b/tests/unittests/request_unittest.cc
index 4703ea216..8a34d457e 100644
--- a/tests/unittests/request_unittest.cc
+++ b/tests/unittests/request_unittest.cc
@@ -234,9 +234,7 @@ static struct TypeExpected {
   {"script.js", true, false, TT_LINK, RT_SCRIPT, 1},
 
   // Image load.
-  // TODO(cef): Should be RT_IMAGE, see http://crbug.com/415253#c23 for the
-  // regression source.
-  {"image.png", true, false, TT_LINK, RT_PREFETCH, 1},
+  {"image.png", true, false, TT_LINK, RT_IMAGE, 1},
 
   // Font load.
   {"font.ttf", true, false, TT_LINK, RT_FONT_RESOURCE, 1},