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

Unified Diff: chrome/browser/metrics/thread_watcher_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/metrics/thread_watcher_unittest.cc
diff --git a/chrome/browser/metrics/thread_watcher_unittest.cc b/chrome/browser/metrics/thread_watcher_unittest.cc
index 53999f8650ac93d3590876b1ce5bcb45d607d621..bd9536838e2b3962174490031c812bd05019ad0c 100644
--- a/chrome/browser/metrics/thread_watcher_unittest.cc
+++ b/chrome/browser/metrics/thread_watcher_unittest.cc
@@ -18,6 +18,7 @@
#include "build/build_config.h"
#include "chrome/browser/metrics/thread_watcher.h"
#include "chrome/common/chrome_switches.h"
+#include "content/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "testing/platform_test.h"
@@ -248,8 +249,9 @@ class ThreadWatcherTest : public ::testing::Test {
ThreadWatcherTest()
: setup_complete_(&lock_),
initialized_(false) {
- webkit_thread_.reset(new BrowserThread(BrowserThread::WEBKIT));
- io_thread_.reset(new BrowserThread(BrowserThread::IO));
+ webkit_thread_.reset(new content::TestBrowserThread(
+ BrowserThread::WEBKIT));
+ io_thread_.reset(new content::TestBrowserThread(BrowserThread::IO));
watchdog_thread_.reset(new WatchDogThread());
webkit_thread_->Start();
io_thread_->Start();
@@ -309,8 +311,8 @@ class ThreadWatcherTest : public ::testing::Test {
base::Lock lock_;
base::ConditionVariable setup_complete_;
bool initialized_;
- scoped_ptr<BrowserThread> webkit_thread_;
- scoped_ptr<BrowserThread> io_thread_;
+ scoped_ptr<content::TestBrowserThread> webkit_thread_;
+ scoped_ptr<content::TestBrowserThread> io_thread_;
scoped_ptr<WatchDogThread> watchdog_thread_;
};
« no previous file with comments | « chrome/browser/metrics/thread_watcher.h ('k') | chrome/browser/net/chrome_fraudulent_certificate_reporter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698