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

Unified Diff: chrome/browser/policy/policy_service_impl_unittest.cc

Issue 17127002: Correctly integrate StoragePartition into TestingProfile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: address comments. merge to ToT. Murder a DB thread and more TestBrowserThreads. Created 7 years, 5 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/policy/policy_service_impl_unittest.cc
diff --git a/chrome/browser/policy/policy_service_impl_unittest.cc b/chrome/browser/policy/policy_service_impl_unittest.cc
index f8d245ae8297f486c06560c44317eedc78ce6fd1..a5178da4e1f47ac2ac48ad5d17f915aa8d4ef954 100644
--- a/chrome/browser/policy/policy_service_impl_unittest.cc
+++ b/chrome/browser/policy/policy_service_impl_unittest.cc
@@ -9,7 +9,6 @@
#include "base/callback.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop.h"
#include "base/run_loop.h"
#include "base/values.h"
#include "chrome/browser/policy/external_data_fetcher.h"
@@ -17,7 +16,7 @@
#include "chrome/browser/policy/policy_domain_descriptor.h"
#include "chrome/browser/policy/policy_schema.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 "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -163,7 +162,7 @@ class PolicyServiceTest : public testing::Test {
PolicyMap policy1_;
PolicyMap policy2_;
scoped_ptr<PolicyServiceImpl> policy_service_;
- base::MessageLoop loop_;
+ content::TestBrowserThreadBundle thread_bundle_;
private:
DISALLOW_COPY_AND_ASSIGN(PolicyServiceTest);
@@ -444,10 +443,6 @@ TEST_F(PolicyServiceTest, PolicyChangeRegistrar) {
}
TEST_F(PolicyServiceTest, RefreshPolicies) {
- content::TestBrowserThread ui_thread(content::BrowserThread::UI, &loop_);
- content::TestBrowserThread file_thread(content::BrowserThread::FILE, &loop_);
- content::TestBrowserThread io_thread(content::BrowserThread::IO, &loop_);
-
EXPECT_CALL(provider0_, RefreshPolicies()).Times(AnyNumber());
EXPECT_CALL(provider1_, RefreshPolicies()).Times(AnyNumber());
EXPECT_CALL(provider2_, RefreshPolicies()).Times(AnyNumber());

Powered by Google App Engine
This is Rietveld 408576698