Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(410)

Side by Side Diff: chrome/browser/ui/tab_contents/test_tab_contents_wrapper.cc

Issue 7892007: Add ChromeRenderViewHostTestHarness to get rid of the dependency from RVHTH to profile (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h" 5 #include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"
6 6
7 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" 7 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
8 #include "chrome/test/base/testing_profile.h" 8 #include "chrome/test/base/testing_profile.h"
9 #include "content/browser/tab_contents/test_tab_contents.h" 9 #include "content/browser/tab_contents/test_tab_contents.h"
10 10
11 TabContentsWrapperTestHarness::TabContentsWrapperTestHarness() 11 TabContentsWrapperTestHarness::TabContentsWrapperTestHarness()
12 : RenderViewHostTestHarness() { 12 : ChromeRenderViewHostTestHarness() {
13 } 13 }
14 14
15 TabContentsWrapperTestHarness::~TabContentsWrapperTestHarness() { 15 TabContentsWrapperTestHarness::~TabContentsWrapperTestHarness() {
16 } 16 }
17 17
18 TestTabContents* TabContentsWrapperTestHarness::contents() { 18 TestTabContents* TabContentsWrapperTestHarness::contents() {
19 return contents_wrapper_.get() ? 19 return contents_wrapper_.get() ?
20 static_cast<TestTabContents*>(contents_wrapper_->tab_contents()) : NULL; 20 static_cast<TestTabContents*>(contents_wrapper_->tab_contents()) : NULL;
21 } 21 }
22 22
23 TabContentsWrapper* TabContentsWrapperTestHarness::contents_wrapper() { 23 TabContentsWrapper* TabContentsWrapperTestHarness::contents_wrapper() {
24 return contents_wrapper_.get(); 24 return contents_wrapper_.get();
25 } 25 }
26 26
27 void TabContentsWrapperTestHarness::SetContents(TestTabContents* contents) { 27 void TabContentsWrapperTestHarness::SetContents(TestTabContents* contents) {
28 contents_wrapper_.reset(contents ? new TabContentsWrapper(contents) : NULL); 28 contents_wrapper_.reset(contents ? new TabContentsWrapper(contents) : NULL);
29 } 29 }
30 30
31 void TabContentsWrapperTestHarness::SetUp() { 31 void TabContentsWrapperTestHarness::SetUp() {
32 if (!browser_context_.get())
33 browser_context_.reset(new TestingProfile());
32 SetContents(CreateTestTabContents()); 34 SetContents(CreateTestTabContents());
33 } 35 }
34 36
35 void TabContentsWrapperTestHarness::TearDown() { 37 void TabContentsWrapperTestHarness::TearDown() {
36 contents_wrapper_.reset(); 38 contents_wrapper_.reset();
37 39
38 // Make sure that we flush any messages related to TabContents destruction 40 // Make sure that we flush any messages related to TabContents destruction
39 // before we destroy the profile. 41 // before we destroy the browser context.
40 MessageLoop::current()->RunAllPending(); 42 MessageLoop::current()->RunAllPending();
41 43
42 // Release the profile on the UI thread. 44 // Release the browser context on the UI thread.
43 message_loop_.DeleteSoon(FROM_HERE, profile_.release()); 45 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
44 message_loop_.RunAllPending(); 46 message_loop_.RunAllPending();
45 } 47 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698