chrome/browser/safe_browsing/client_side_detection_host_unittest.cc - Issue 8392042: Split BrowserThread into public API and private implementation, step 1.

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 8392042: Split BrowserThread into public API and private implementation, step 1. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 9 years, 2 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/safe_browsing/client_side_detection_host.cc ('k') | chrome/browser/safe_browsing/client_side_detection_service.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 60da4ea558032946494810bb14eadb16c73da54f..0661732fc3906b9e7e13561dece9589fc60b453b 100644

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

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

@@ -16,9 +16,9 @@

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

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

#include "chrome/test/base/testing_profile.h"

-#include "content/browser/browser_thread.h"

#include "content/browser/renderer_host/test_render_view_host.h"

#include "content/browser/tab_contents/test_tab_contents.h"

+#include "content/test/test_browser_thread.h"

#include "googleurl/src/gurl.h"

#include "ipc/ipc_test_sink.h"

#include "testing/gmock/include/gmock/gmock.h"

@@ -149,10 +149,11 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness {

mock_profile_ = new NiceMock<MockTestingProfile>();

browser_context_.reset(mock_profile_);

- ui_thread_.reset(new BrowserThread(BrowserThread::UI, &message_loop_));

+ ui_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,

+ &message_loop_));

// Note: we're starting a real IO thread to make sure our DCHECKs that

// verify which thread is running are actually tested.

- io_thread_.reset(new BrowserThread(BrowserThread::IO));

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

ASSERT_TRUE(io_thread_->Start());

TabContentsWrapperTestHarness::SetUp();

@@ -287,8 +288,8 @@ class ClientSideDetectionHostTest : public TabContentsWrapperTestHarness {

MockTestingProfile* mock_profile_; // We don't own this object

private:

- scoped_ptr<BrowserThread> ui_thread_;

- scoped_ptr<BrowserThread> io_thread_;

+ scoped_ptr<content::TestBrowserThread> ui_thread_;

+ scoped_ptr<content::TestBrowserThread> io_thread_;

};

TEST_F(ClientSideDetectionHostTest, OnPhishingDetectionDoneInvalidVerdict) {