From 8a68e6ae1f1eab523d52c469ecc380c3f50ab0a7 Mon Sep 17 00:00:00 2001 From: sadrul Date: Tue, 4 Aug 2015 13:35:03 -0700 Subject: [PATCH] aura: Remove more code that explicitly creates/destroys aura::Env. aura::Env instance should have a more clear lifetime, instead of random code creating/deleting the instance. BUG=none Review URL: https://codereview.chromium.org/1256953004 Cr-Commit-Position: refs/heads/master@{#341781} --- chrome/browser/extensions/test_extension_environment.cc | 10 ---------- .../test/base/chrome_render_view_host_test_harness.cc | 8 -------- .../test/base/view_event_test_platform_part_chromeos.cc | 2 -- .../renderer_host/render_widget_host_unittest.cc | 3 --- content/public/test/test_web_contents_factory.h | 3 --- content/test/test_web_contents_factory.cc | 17 +---------------- 6 files changed, 1 insertion(+), 42 deletions(-) diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc index 26a067409da7..7044795e2328 100644 --- a/chrome/browser/extensions/test_extension_environment.cc +++ b/chrome/browser/extensions/test_extension_environment.cc @@ -27,10 +27,6 @@ #include "chrome/browser/chromeos/settings/device_settings_service.h" #endif -#if defined(USE_AURA) -#include "ui/aura/env.h" -#endif - namespace extensions { using content::BrowserThread; @@ -112,15 +108,9 @@ void TestExtensionEnvironment::Init() { if (!chromeos::DeviceSettingsService::IsInitialized()) chromeos_env_.reset(new ChromeOSEnv); #endif -#if defined(USE_AURA) - aura::Env::CreateInstance(true); -#endif } TestExtensionEnvironment::~TestExtensionEnvironment() { -#if defined(USE_AURA) - aura::Env::DeleteInstance(); -#endif } TestingProfile* TestExtensionEnvironment::profile() const { diff --git a/chrome/test/base/chrome_render_view_host_test_harness.cc b/chrome/test/base/chrome_render_view_host_test_harness.cc index 3aa71333fe30..b32b8e62fcd5 100644 --- a/chrome/test/base/chrome_render_view_host_test_harness.cc +++ b/chrome/test/base/chrome_render_view_host_test_harness.cc @@ -16,11 +16,6 @@ #include "ash/shell.h" #endif -#if defined(USE_AURA) -#include "ui/aura/env.h" -#include "ui/aura/window_event_dispatcher.h" -#endif - using content::RenderViewHostTester; using content::RenderViewHostTestHarness; @@ -65,9 +60,6 @@ void ChromeRenderViewHostTestHarness::TearDown() { #if defined(USE_ASH) ash::Shell::DeleteInstance(); #endif -#if defined(USE_AURA) - aura::Env::DeleteInstance(); -#endif } content::BrowserContext* diff --git a/chrome/test/base/view_event_test_platform_part_chromeos.cc b/chrome/test/base/view_event_test_platform_part_chromeos.cc index d1e996367e37..e94e081624ec 100644 --- a/chrome/test/base/view_event_test_platform_part_chromeos.cc +++ b/chrome/test/base/view_event_test_platform_part_chromeos.cc @@ -64,8 +64,6 @@ ViewEventTestPlatformPartChromeOS::~ViewEventTestPlatformPartChromeOS() { // Ash Shell can't just live on its own without a browser process, we need to // also shut down the message center. message_center::MessageCenter::Shutdown(); - - aura::Env::DeleteInstance(); } } // namespace diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index 9d3f0dc026a6..06dce52941e0 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -39,7 +39,6 @@ #if defined(USE_AURA) #include "content/browser/renderer_host/render_widget_host_view_aura.h" #include "content/browser/renderer_host/ui_events_helper.h" -#include "ui/aura/env.h" #include "ui/aura/test/test_screen.h" #include "ui/events/event.h" #endif @@ -424,7 +423,6 @@ class RenderWidgetHostTest : public testing::Test { } #endif #if defined(USE_AURA) - aura::Env::CreateInstance(true); screen_.reset(aura::TestScreen::Create(gfx::Size())); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); #endif @@ -446,7 +444,6 @@ class RenderWidgetHostTest : public testing::Test { browser_context_.reset(); #if defined(USE_AURA) - aura::Env::DeleteInstance(); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, nullptr); screen_.reset(); #endif diff --git a/content/public/test/test_web_contents_factory.h b/content/public/test/test_web_contents_factory.h index 8b48f9ef2e44..92cdcae72721 100644 --- a/content/public/test/test_web_contents_factory.h +++ b/content/public/test/test_web_contents_factory.h @@ -41,9 +41,6 @@ class TestWebContentsFactory { // The vector of web contents that this class created. ScopedVector web_contents_; - // True if the factory initialized aura (and should thus tear it down). - bool tear_down_aura_; - DISALLOW_COPY_AND_ASSIGN(TestWebContentsFactory); }; diff --git a/content/test/test_web_contents_factory.cc b/content/test/test_web_contents_factory.cc index 0bf7a015bc5f..0cbbbe83f944 100644 --- a/content/test/test_web_contents_factory.cc +++ b/content/test/test_web_contents_factory.cc @@ -9,21 +9,10 @@ #include "content/public/test/test_renderer_host.h" #include "content/public/test/web_contents_tester.h" -#if defined(USE_AURA) -#include "ui/aura/env.h" -#endif - namespace content { TestWebContentsFactory::TestWebContentsFactory() - : rvh_enabler_(new content::RenderViewHostTestEnabler()), - tear_down_aura_(false) { -#if defined(USE_AURA) - if (aura::Env::GetInstanceDontCreate() == nullptr) { - aura::Env::CreateInstance(true); - tear_down_aura_ = true; - } -#endif + : rvh_enabler_(new content::RenderViewHostTestEnabler()) { } TestWebContentsFactory::~TestWebContentsFactory() { @@ -36,10 +25,6 @@ TestWebContentsFactory::~TestWebContentsFactory() { rvh_enabler_.reset(); // Let any posted tasks for RenderProcess/ViewHost deletion run. base::RunLoop().RunUntilIdle(); -#if defined(USE_AURA) - if (tear_down_aura_) - aura::Env::DeleteInstance(); -#endif } WebContents* TestWebContentsFactory::CreateWebContents( -- 2.11.4.GIT