Also delay regular profile destruction...

chrome/test/base/browser_with_test_window_test.cc

 // Copyright (c) 2011 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"
 
 #if defined(OS_WIN)
 #include <ole2.h>
 #endif  // defined(OS_WIN)
 
+#include "chrome//browser/profiles/profile_destroyer.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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"
 
@@ skipping 10 matching lines @@
   OleInitialize(NULL);
 #endif
 #if defined(USE_AURA)
   test_activation_client_.reset(new aura::test::TestActivationClient);
 #endif
 }
 
 void BrowserWithTestWindowTest::SetUp() {
   testing::Test::SetUp();
 
-  profile_.reset(CreateProfile());
+  set_profile(CreateProfile());
   browser_.reset(new Browser(Browser::TYPE_TABBED, profile()));
   window_.reset(new TestBrowserWindow(browser()));
   browser_->SetWindowForTesting(window_.get());
 }
 
 BrowserWithTestWindowTest::~BrowserWithTestWindowTest() {
   // A Task is leaked if we don't destroy everything, then run the message
   // loop.
   DestroyBrowser();
   profile_.reset(NULL);
 
   MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
   MessageLoop::current()->Run();
 
 #if defined(OS_WIN)
   OleUninitialize();
 #endif
 }
 
+void BrowserWithTestWindowTest::set_profile(TestingProfile* profile) {
+  if (profile_.get() != NULL)
+    ProfileDestroyer::DestroyProfileWhenAppropriate(profile_.release());
+
+  profile_.reset(profile);
+}
+
 TestRenderViewHost* BrowserWithTestWindowTest::TestRenderViewHostForTab(
     WebContents* web_contents) {
   return static_cast<TestRenderViewHost*>(web_contents->GetRenderViewHost());
 }
 
 void BrowserWithTestWindowTest::AddTab(Browser* browser, const GURL& url) {
   browser::NavigateParams params(browser, url, content::PAGE_TRANSITION_TYPED);
   params.tabstrip_index = 0;
   params.disposition = NEW_FOREGROUND_TAB;
   browser::Navigate(&params);
@@ skipping 61 matching lines @@
   // Make sure we close all tabs, otherwise Browser isn't happy in its
   // destructor.
   browser()->CloseAllTabs();
   browser_.reset(NULL);
   window_.reset(NULL);
 }
 
 TestingProfile* BrowserWithTestWindowTest::CreateProfile() {
   return new TestingProfile();
 }