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

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

Issue 6720050: Make contents settable in RVHTH. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 8 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/testing_profile.h" 8 #include "chrome/test/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 : RenderViewHostTestHarness() {
13 } 13 }
14 14
15 TabContentsWrapperTestHarness::~TabContentsWrapperTestHarness() { 15 TabContentsWrapperTestHarness::~TabContentsWrapperTestHarness() {
16 } 16 }
17 17
18 TestTabContents* TabContentsWrapperTestHarness::contents() { 18 TestTabContents* TabContentsWrapperTestHarness::contents() {
19 return static_cast<TestTabContents*>(contents_wrapper_.get()->tab_contents()); 19 return static_cast<TestTabContents*>(contents_wrapper_.get()->tab_contents());
20 } 20 }
21 21
22 TabContentsWrapper* TabContentsWrapperTestHarness::contents_wrapper() { 22 TabContentsWrapper* TabContentsWrapperTestHarness::contents_wrapper() {
23 return contents_wrapper_.get(); 23 return contents_wrapper_.get();
24 } 24 }
25 25
26 void TabContentsWrapperTestHarness::SetContents(TestTabContents* contents) {
27 contents_wrapper_.reset(new TabContentsWrapper(contents));
28 }
29
26 void TabContentsWrapperTestHarness::SetUp() { 30 void TabContentsWrapperTestHarness::SetUp() {
27 contents_wrapper_.reset(new TabContentsWrapper(CreateTestTabContents())); 31 SetContents(CreateTestTabContents());
28 } 32 }
29 33
30 void TabContentsWrapperTestHarness::TearDown() { 34 void TabContentsWrapperTestHarness::TearDown() {
31 contents_wrapper_.reset(); 35 contents_wrapper_.reset();
32 36
33 // Make sure that we flush any messages related to TabContents destruction 37 // Make sure that we flush any messages related to TabContents destruction
34 // before we destroy the profile. 38 // before we destroy the profile.
35 MessageLoop::current()->RunAllPending(); 39 MessageLoop::current()->RunAllPending();
36 40
37 // Release the profile on the UI thread. 41 // Release the profile on the UI thread.
38 message_loop_.DeleteSoon(FROM_HERE, profile_.release()); 42 message_loop_.DeleteSoon(FROM_HERE, profile_.release());
39 message_loop_.RunAllPending(); 43 message_loop_.RunAllPending();
40 } 44 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h ('k') | content/browser/renderer_host/test_render_view_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698