Revert of Make TestRenderWidgetHostView::Show/Hide call through to RWHI

chrome/browser/extensions/extension_context_menu_model_unittest.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 "chrome/browser/extensions/extension_context_menu_model.h"
 
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 25 matching lines @@
 #include "extensions/browser/test_management_policy.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/feature_switch.h"
 #include "extensions/common/manifest.h"
 #include "extensions/common/manifest_constants.h"
 #include "extensions/common/manifest_handlers/options_page_info.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/value_builder.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/display/test/test_screen.h"
 #include "ui/gfx/image/image.h"
 
 namespace extensions {
 
 namespace {
 
 void Increment(int* i) {
   CHECK(i);
   ++(*i);
 }
@@ skipping 77 matching lines @@
       const char* action_key,
       Manifest::Location location,
       const std::string& host_permission);
 
   Browser* GetBrowser();
 
   void SetUp() override;
   void TearDown() override;
 
  private:
-  display::test::TestScreen test_screen_;
   std::unique_ptr<TestBrowserWindow> test_window_;
   std::unique_ptr<Browser> browser_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionContextMenuModelTest);
 };
 
 ExtensionContextMenuModelTest::ExtensionContextMenuModelTest() {}
 
 const Extension* ExtensionContextMenuModelTest::AddExtension(
     const std::string& name,
@@ skipping 32 matching lines @@
   if (!browser_) {
     Browser::CreateParams params(profile());
     test_window_.reset(new TestBrowserWindow());
     params.window = test_window_.get();
     browser_.reset(new Browser(params));
   }
   return browser_.get();
 }
 
 void ExtensionContextMenuModelTest::SetUp() {
-  display::Screen::SetScreenInstance(&test_screen_);
   ExtensionServiceTestBase::SetUp();
   if (content::IsBrowserSideNavigationEnabled())
     content::BrowserSideNavigationSetUp();
 }
 
 void ExtensionContextMenuModelTest::TearDown() {
   if (content::IsBrowserSideNavigationEnabled())
     content::BrowserSideNavigationTearDown();
   ExtensionServiceTestBase::TearDown();
-  display::Screen::SetScreenInstance(nullptr);
 }
 
 // Tests that applicable menu items are disabled when a ManagementPolicy
 // prohibits them.
 TEST_F(ExtensionContextMenuModelTest, RequiredInstallationsDisablesItems) {
   InitializeEmptyExtensionService();
 
   // Test that management policy can determine whether or not policy-installed
   // extensions can be installed/uninstalled.
   const Extension* extension = AddExtension(
@@ skipping 493 matching lines @@
         "no_action", nullptr, Manifest::INTERNAL);
     ExtensionContextMenuModel menu(no_action, GetBrowser(),
                                    ExtensionContextMenuModel::VISIBLE, nullptr);
     int inspect_popup_index =
         menu.GetIndexOfCommandId(ExtensionContextMenuModel::INSPECT_POPUP);
     EXPECT_EQ(-1, inspect_popup_index);
   }
 }
 
 }  // namespace extensions