chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc - Issue 17127002: Correctly integrate StoragePartition into TestingProfile.

Unified Diff: chrome/browser/policy/cloud/user_policy_signin_service_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

« chrome/browser/password_manager/password_store_x_unittest.cc ('K') | « chrome/browser/policy/cloud/device_management_service_unittest.cc ('k') | chrome/browser/policy/policy_service_impl_unittest.cc » ('j') | chrome/browser/printing/cloud_print/test/cloud_print_proxy_process_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

diff --git a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

index 451281396d78a601f0d980f2af1d037130554984..222a0cc9cd72ef133f64ce26db9b2c3e0314b8d0 100644

--- a/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

+++ b/chrome/browser/policy/cloud/user_policy_signin_service_unittest.cc

@@ -28,7 +28,7 @@

#include "content/public/browser/notification_details.h"

#include "content/public/browser/notification_service.h"

#include "content/public/browser/notification_source.h"

-#include "content/public/test/test_browser_thread.h"

+#include "content/public/test/test_browser_thread_bundle.h"

#include "google_apis/gaia/gaia_constants.h"

#include "google_apis/gaia/google_service_auth_error.h"

#include "net/http/http_status_code.h"

@@ -141,10 +141,7 @@ class FakeProfileOAuth2TokenService : public AndroidProfileOAuth2TokenService {

class UserPolicySigninServiceTest : public testing::Test {

public:

UserPolicySigninServiceTest()

- : loop_(base::MessageLoop::TYPE_IO),

- ui_thread_(content::BrowserThread::UI, &loop_),

- file_thread_(content::BrowserThread::FILE, &loop_),

- io_thread_(content::BrowserThread::IO, &loop_),

+ : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP),

register_completed_(false) {}

MOCK_METHOD1(OnPolicyRefresh, void(bool));

@@ -187,7 +184,6 @@ class UserPolicySigninServiceTest : public testing::Test {

TestingProfile::Builder builder;

builder.SetPrefService(scoped_ptr<PrefServiceSyncable>(prefs.Pass()));

profile_ = builder.Build().Pass();

- profile_->CreateRequestContext();

mock_store_ = new MockUserCloudPolicyStore();

EXPECT_CALL(*mock_store_, Load()).Times(AnyNumber());

@@ -341,10 +337,7 @@ class UserPolicySigninServiceTest : public testing::Test {

// BrowserPolicyConnector and UrlFetcherFactory want to initialize and free

// various components asynchronously via tasks, so create fake threads here.

- base::MessageLoop loop_;

- content::TestBrowserThread ui_thread_;

- content::TestBrowserThread file_thread_;

- content::TestBrowserThread io_thread_;

+ content::TestBrowserThreadBundle thread_bundle_;

net::TestURLFetcherFactory url_factory_;