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

Unified Diff: chrome/browser/safe_browsing/client_side_detection_service_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
Index: chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
diff --git a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
index de6a1122708c5b376bb828a12d5b8aedf3e0c45e..4287b4f64e2fc78adcd5678efc02a43498bf0838 100644
--- a/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
+++ b/chrome/browser/safe_browsing/client_side_detection_service_unittest.cc
@@ -15,8 +15,8 @@
#include "chrome/browser/safe_browsing/client_side_detection_service.h"
#include "chrome/common/safe_browsing/client_model.pb.h"
#include "chrome/common/safe_browsing/csd.pb.h"
-#include "content/browser/browser_thread.h"
#include "content/common/net/url_fetcher.h"
+#include "content/test/test_browser_thread.h"
#include "content/test/test_url_fetcher_factory.h"
#include "crypto/sha2.h"
#include "googleurl/src/gurl.h"
@@ -62,11 +62,13 @@ ACTION(QuitCurrentMessageLoop) {
class ClientSideDetectionServiceTest : public testing::Test {
protected:
virtual void SetUp() {
- file_thread_.reset(new BrowserThread(BrowserThread::FILE, &msg_loop_));
+ file_thread_.reset(new content::TestBrowserThread(BrowserThread::FILE,
+ &msg_loop_));
factory_.reset(new FakeURLFetcherFactory());
- browser_thread_.reset(new BrowserThread(BrowserThread::UI, &msg_loop_));
+ browser_thread_.reset(new content::TestBrowserThread(BrowserThread::UI,
+ &msg_loop_));
}
virtual void TearDown() {
@@ -189,8 +191,8 @@ class ClientSideDetectionServiceTest : public testing::Test {
msg_loop_.Quit();
}
- scoped_ptr<BrowserThread> browser_thread_;
- scoped_ptr<BrowserThread> file_thread_;
+ scoped_ptr<content::TestBrowserThread> browser_thread_;
+ scoped_ptr<content::TestBrowserThread> file_thread_;
GURL phishing_url_;
bool is_phishing_;

Powered by Google App Engine
This is Rietveld 408576698