| Index: chrome/test/base/browser_with_test_window_test.cc
|
| ===================================================================
|
| --- chrome/test/base/browser_with_test_window_test.cc (revision 122340)
|
| +++ chrome/test/base/browser_with_test_window_test.cc (working copy)
|
| @@ -8,6 +8,7 @@
|
| #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"
|
| @@ -38,7 +39,7 @@
|
| 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());
|
| @@ -58,6 +59,13 @@
|
| #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());
|
|
|