chrome/browser/safe_browsing/client_side_detection_host_unittest.cc - Issue 10542010: TabContentsWrapper -> TabContents, part 2.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

Issue 10542010: TabContentsWrapper -> TabContents, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase, rename Created 8 years, 6 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/intents/register_intent_handler_infobar_delegate_unittest.cc ('k') | chrome/browser/translate/translate_manager_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

diff --git a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

index fa8731fdf8a5515eb82605fbc88e66180a1214af..f57e7175a49890949312169e2fed3992b85b3d52 100644

--- a/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

+++ b/chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

@@ -11,7 +11,7 @@

#include "chrome/browser/safe_browsing/client_side_detection_service.h"

#include "chrome/browser/safe_browsing/safe_browsing_service.h"

#include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

-#include "chrome/browser/ui/tab_contents/test_tab_contents_wrapper.h"

+#include "chrome/browser/ui/tab_contents/test_tab_contents.h"

#include "chrome/common/chrome_switches.h"

#include "chrome/common/safe_browsing/csd.pb.h"

#include "chrome/common/safe_browsing/safebrowsing_messages.h"

@@ -154,7 +154,7 @@ void QuitUIMessageLoopFromIO() {

}

} // namespace

-class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness {

+class ClientSideDetectionHostTest : public TabContentsTestHarness {

public:

virtual void SetUp() {

// Set custom profile object so that we can mock calls to IsOffTheRecord.

@@ -173,13 +173,13 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness {

io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO));

ASSERT_TRUE(io_thread_->Start());

- TabContentsWrapperTestHarness::SetUp();

+ TabContentsTestHarness::SetUp();

// Inject service classes.

csd_service_.reset(new StrictMock<MockClientSideDetectionService>());

sb_service_ = new StrictMock<MockSafeBrowsingService>();

csd_host_.reset(safe_browsing::ClientSideDetectionHost::Create(

- contents_wrapper()->web_contents()));

+ tab_contents()->web_contents()));

csd_host_->set_client_side_detection_service(csd_service_.get());

csd_host_->set_safe_browsing_service(sb_service_.get());

// We need to create this here since we don't call

@@ -199,7 +199,7 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness {

csd_host_.release());

sb_service_ = NULL;

message_loop_.RunAllPending();

- TabContentsWrapperTestHarness::TearDown();

+ TabContentsTestHarness::TearDown();

// Let the tasks on the IO thread run to avoid memory leaks.

base::WaitableEvent done(false, false);