Moves management of transients out of Window

chrome/test/base/browser_with_test_window_test.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/test/base/browser_with_test_window_test.h"
 
 #include "base/run_loop.h"
 #include "chrome/browser/profiles/profile_destroyer.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/test/test_renderer_host.h"
 
 #if defined(USE_AURA)
 #include "ui/aura/test/aura_test_helper.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/test/ash_test_helper.h"
 #endif
 
+#if defined(TOOLKIT_VIEWS)
+#include "ui/views/test/test_views_delegate.h"
+#endif
+
 using content::NavigationController;
 using content::RenderViewHost;
 using content::RenderViewHostTester;
 using content::WebContents;
 
 BrowserWithTestWindowTest::BrowserWithTestWindowTest()
     : host_desktop_type_(chrome::HOST_DESKTOP_TYPE_NATIVE) {
 }
 
 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
@@ skipping 12 matching lines @@
   // AshTestHelper and AuraTestHelper so they can be used at the same time,
   // perhaps by AshTestHelper owning an AuraTestHelper.
   ash_test_helper_.reset(new ash::test::AshTestHelper(
       base::MessageLoopForUI::current()));
   ash_test_helper_->SetUp(true);
 #elif defined(USE_AURA)
   aura_test_helper_.reset(new aura::test::AuraTestHelper(
       base::MessageLoopForUI::current()));
   aura_test_helper_->SetUp();
 #endif  // USE_AURA
+#if defined(TOOLKIT_VIEWS)
+  views_delegate_.reset(CreateViewsDelegate());
+  views::ViewsDelegate::views_delegate = views_delegate_.get();
+#endif
 
   // Subclasses can provide their own Profile.
   profile_ = CreateProfile();
   // Subclasses can provide their own test BrowserWindow. If they return NULL
   // then Browser will create the a production BrowserWindow and the subclass
   // is responsible for cleaning it up (usually by NativeWidget destruction).
   window_.reset(CreateBrowserWindow());
 
   browser_.reset(CreateBrowser(profile(), host_desktop_type_, window_.get()));
 }
@@ skipping 12 matching lines @@
 #elif defined(USE_AURA)
   aura_test_helper_->TearDown();
 #endif
   testing::Test::TearDown();
 
   // A Task is leaked if we don't destroy everything, then run the message
   // loop.
   base::MessageLoop::current()->PostTask(FROM_HERE,
                                          base::MessageLoop::QuitClosure());
   base::MessageLoop::current()->Run();
+
+#if defined(TOOLKIT_VIEWS)
+  views::ViewsDelegate::views_delegate = NULL;
+  views_delegate_.reset(NULL);
+#endif
 }
 
 void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) {
   chrome::NavigateParams params(browser, url, content::PAGE_TRANSITION_TYPED);
   params.tabstrip_index = 0;
   params.disposition = NEW_FOREGROUND_TAB;
   chrome::Navigate(&params);
   CommitPendingLoad(&params.target_contents->GetController());
 }
 
@@ skipping 93 matching lines @@
 }
 
 Browser* BrowserWithTestWindowTest::CreateBrowser(
     Profile* profile,
     chrome::HostDesktopType host_desktop_type,
     BrowserWindow* browser_window) {
   Browser::CreateParams params(profile, host_desktop_type);
   params.window = browser_window;
   return new Browser(params);
 }
+
+#if defined(TOOLKIT_VIEWS)
+views::ViewsDelegate* BrowserWithTestWindowTest::CreateViewsDelegate() {
+  return new views::TestViewsDelegate;
+}
+#endif