Revert of Backfill some UI tests.

content/test/test_render_view_host.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/test/test_render_view_host.h"
 
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/page_state.h"
 #include "content/public/common/web_preferences.h"
 #include "content/test/test_render_frame_host.h"
 #include "content/test/test_web_contents.h"
 #include "media/base/video_frame.h"
 #include "ui/aura/env.h"
 #include "ui/compositor/compositor.h"
-#include "ui/compositor/layer_type.h"
 #include "ui/gfx/geometry/rect.h"
 
-#if defined(USE_AURA)
-#include "ui/aura/test/test_window_delegate.h"
-#endif
-
 namespace content {
 
 void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
                         int nav_entry_id,
                         bool did_create_new_entry,
                         const GURL& url,
                         ui::PageTransition transition) {
   params->nav_entry_id = nav_entry_id;
   params->url = url;
   params->origin = url::Origin(url);
@@ skipping 21 matching lines @@
   GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
 #else
   // Not all tests initialize or need an image transport factory.
   if (ImageTransportFactory::GetInstance()) {
     frame_sink_id_ = AllocateFrameSinkId();
     GetSurfaceManager()->RegisterFrameSinkId(frame_sink_id_);
   }
 #endif
 
   rwh_->SetView(this);
-
-#if defined(USE_AURA)
-  window_.reset(new aura::Window(
-      aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate()));
-  window_->set_owned_by_parent(false);
-  window_->Init(ui::LayerType::LAYER_NOT_DRAWN);
-#endif
 }
 
 TestRenderWidgetHostView::~TestRenderWidgetHostView() {
   cc::SurfaceManager* manager = GetSurfaceManager();
   if (manager) {
     manager->InvalidateFrameSinkId(frame_sink_id_);
   }
 }
 
 RenderWidgetHost* TestRenderWidgetHostView::GetRenderWidgetHost() const {
   return rwh_;
 }
 
 gfx::Vector2dF TestRenderWidgetHostView::GetLastScrollOffset() const {
   return gfx::Vector2dF();
 }
 
 gfx::NativeView TestRenderWidgetHostView::GetNativeView() const {
-#if defined(USE_AURA)
-  return window_.get();
-#else
   return nullptr;
-#endif
 }
 
 gfx::NativeViewAccessible TestRenderWidgetHostView::GetNativeViewAccessible() {
   return nullptr;
 }
 
 ui::TextInputClient* TestRenderWidgetHostView::GetTextInputClient() {
   return &text_input_client_;
 }
 
@@ skipping 214 matching lines @@
 
 TestRenderFrameHost* RenderViewHostImplTestHarness::main_test_rfh() {
   return contents()->GetMainFrame();
 }
 
 TestWebContents* RenderViewHostImplTestHarness::contents() {
   return static_cast<TestWebContents*>(web_contents());
 }
 
 }  // namespace content