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

Unified Diff: chrome/browser/extensions/user_script_master_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/extensions/user_script_master_unittest.cc
diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc
index 0334a0ce668ad49f8dd0b7e4f3ccf65adc129bcf..7e494a5e717133bcfdcb37861058c655cabf80aa 100644
--- a/chrome/browser/extensions/user_script_master_unittest.cc
+++ b/chrome/browser/extensions/user_script_master_unittest.cc
@@ -14,9 +14,9 @@
#include "base/string_util.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/browser/browser_thread.h"
#include "content/public/browser/notification_registrar.h"
#include "content/public/browser/notification_service.h"
+#include "content/test/test_browser_thread.h"
#include "testing/gtest/include/gtest/gtest.h"
namespace {
@@ -48,9 +48,9 @@ class UserScriptMasterTest : public testing::Test,
// UserScriptMaster posts tasks to the file thread so make the current
// thread look like one.
- file_thread_.reset(new BrowserThread(
+ file_thread_.reset(new content::TestBrowserThread(
BrowserThread::FILE, MessageLoop::current()));
- ui_thread_.reset(new BrowserThread(
+ ui_thread_.reset(new content::TestBrowserThread(
BrowserThread::UI, MessageLoop::current()));
}
@@ -77,8 +77,8 @@ class UserScriptMasterTest : public testing::Test,
// MessageLoop used in tests.
MessageLoop message_loop_;
- scoped_ptr<BrowserThread> file_thread_;
- scoped_ptr<BrowserThread> ui_thread_;
+ scoped_ptr<content::TestBrowserThread> file_thread_;
+ scoped_ptr<content::TestBrowserThread> ui_thread_;
// Updated to the script shared memory when we get notified.
base::SharedMemory* shared_memory_;
« no previous file with comments | « chrome/browser/extensions/user_script_master.h ('k') | chrome/browser/extensions/webstore_install_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698