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

Unified Diff: chrome/browser/extensions/activity_log/activity_log_unittest.cc

Issue 14197014: Add TestBrowserThreadBundle into RenderViewHostTestHarness. Kill some unnecessary real threads. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: once more unto the try serves. Created 7 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
Index: chrome/browser/extensions/activity_log/activity_log_unittest.cc
diff --git a/chrome/browser/extensions/activity_log/activity_log_unittest.cc b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
index 9e0bb12e134871d53f4c1d415e9fed1f98dac839..1751e3752f314ff529b39fdb047789583d879987 100644
--- a/chrome/browser/extensions/activity_log/activity_log_unittest.cc
+++ b/chrome/browser/extensions/activity_log/activity_log_unittest.cc
@@ -16,8 +16,7 @@
#include "chrome/common/extensions/dom_action_types.h"
#include "chrome/common/extensions/extension_builder.h"
#include "chrome/test/base/testing_profile.h"
-#include "content/public/browser/browser_thread.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
#include "sql/statement.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -36,15 +35,12 @@ const char kExtensionId[] = "abc";
namespace extensions {
class ActivityLogTest : public testing::Test {
- public:
+ protected:
ActivityLogTest()
- : message_loop_(base::MessageLoop::TYPE_IO),
- ui_thread_(BrowserThread::UI, &message_loop_),
- db_thread_(BrowserThread::DB, &message_loop_),
- file_thread_(BrowserThread::FILE, &message_loop_),
- io_thread_(BrowserThread::IO, &message_loop_) {}
-
- virtual void SetUp() OVERRIDE {
+ : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP) {
+#if defined OS_CHROMEOS
+ test_user_manager_.reset(new chromeos::ScopedTestUserManager());
+#endif
CommandLine command_line(CommandLine::NO_PROGRAM);
profile_.reset(new TestingProfile());
CommandLine::ForCurrentProcess()->AppendSwitch(
@@ -57,14 +53,12 @@ class ActivityLogTest : public testing::Test {
&command_line, base::FilePath(), false);
}
- virtual void TearDown() OVERRIDE {
+ virtual ~ActivityLogTest() {
+#if defined OS_CHROMEOS
+ test_user_manager_.reset();
+#endif
base::RunLoop().RunUntilIdle();
profile_.reset(NULL);
- base::MessageLoop::current()->PostDelayedTask(
- FROM_HERE,
- base::MessageLoop::QuitClosure(),
- base::TimeDelta::FromSeconds(4)); // Don't hang on failure.
- base::RunLoop().RunUntilIdle();
}
static void RetrieveActions_LogAndFetchActions(
@@ -94,17 +88,11 @@ class ActivityLogTest : public testing::Test {
scoped_ptr<TestingProfile> profile_;
ExtensionService* extension_service_;
- private:
- base::MessageLoop message_loop_;
- content::TestBrowserThread ui_thread_;
- content::TestBrowserThread db_thread_;
- content::TestBrowserThread file_thread_;
- content::TestBrowserThread io_thread_;
-
+ content::TestBrowserThreadBundle thread_bundle_;
#if defined OS_CHROMEOS
chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
chromeos::ScopedTestCrosSettings test_cros_settings_;
- chromeos::ScopedTestUserManager test_user_manager_;
+ scoped_ptr<chromeos::ScopedTestUserManager> test_user_manager_;
#endif
};

Powered by Google App Engine
This is Rietveld 408576698