Remove some code inside USE_AURA and OS_WIN ifdefs.

content/browser/web_contents/web_contents_impl.cc

Index: content/browser/web_contents/web_contents_impl.cc
===================================================================
--- content/browser/web_contents/web_contents_impl.cc	(revision 244508)
+++ content/browser/web_contents/web_contents_impl.cc	(working copy)
@@ -370,7 +370,7 @@
       controller_(this, browser_context),
       render_view_host_delegate_view_(NULL),
       opener_(opener),
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
       accessible_parent_(NULL),
 #endif
       frame_tree_(new NavigatorImpl(&controller_, this),
@@ -430,17 +430,6 @@
       Source<WebContents>(this),
       NotificationService::NoDetails());
 
-  // TODO(brettw) this should be moved to the view.
-#if defined(OS_WIN) && !defined(USE_AURA)
-  // If we still have a window handle, destroy it. GetNativeView can return
-  // NULL if this contents was part of a window that closed.
-  if (view_->GetNativeView()) {
-    RenderViewHost* host = GetRenderViewHost();
-    if (host && host->GetView())
-      RenderWidgetHostViewPort::FromRWHV(host->GetView())->WillWmDestroy();
-  }
-#endif
-
   RenderViewHost* pending_rvh = GetRenderManager()->pending_render_view_host();
   if (pending_rvh) {
     FOR_EACH_OBSERVER(WebContentsObserver,
@@ -776,7 +765,7 @@
   return renderer_preferences_.user_agent_override;
 }
 
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
 void WebContentsImpl::SetParentNativeViewAccessible(
 gfx::NativeViewAccessible accessible_parent) {
   accessible_parent_ = accessible_parent;
@@ -1248,7 +1237,7 @@
   return false;
 }
 
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
 gfx::NativeViewAccessible WebContentsImpl::GetParentNativeViewAccessible() {
   return accessible_parent_;
 }