Fixes use after free during drag and drop.

chrome/browser/ui/views/frame/browser_frame_aura.cc

Index: chrome/browser/ui/views/frame/browser_frame_aura.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.cc b/chrome/browser/ui/views/frame/browser_frame_aura.cc
index 6e4902d6c2a396612ccad736a34271d8333add44..b80f5dcf7ca04da4fe1d1d57f46f7cd0789cbd14 100644
--- a/chrome/browser/ui/views/frame/browser_frame_aura.cc
+++ b/chrome/browser/ui/views/frame/browser_frame_aura.cc
@@ -19,11 +19,6 @@
 
 #if defined(USE_ASH)
 #include "ash/wm/window_util.h"
-#include "chrome/browser/ui/ash/ash_init.h"
-#endif
-
-#if !defined(OS_CHROMEOS)
-#include "chrome/browser/ui/views/frame/desktop_browser_frame_aura.h"
 #endif
 
 using aura::Window;
@@ -162,25 +157,6 @@ const gfx::Font& BrowserFrame::GetTitleFont() {
   return *title_font;
 }
 
-////////////////////////////////////////////////////////////////////////////////
-// NativeBrowserFrame, public:
-
-// static
-NativeBrowserFrame* NativeBrowserFrame::CreateNativeBrowserFrame(
-    BrowserFrame* browser_frame,
-    BrowserView* browser_view) {
-#if !defined(OS_CHROMEOS)
-  if (
-#if defined(USE_ASH)
-      !chrome::ShouldOpenAshOnStartup() &&
-#endif
-      browser_view->browser()->
-          host_desktop_type() == chrome::HOST_DESKTOP_TYPE_NATIVE)
-    return new DesktopBrowserFrameAura(browser_frame, browser_view);
-#endif
-  return new BrowserFrameAura(browser_frame, browser_view);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // BrowserFrameAura, private: