chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc - Issue 17127002: Correctly integrate StoragePartition into TestingProfile.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/managed_mode/managed_user_refresh_token_fetcher_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

« no previous file with comments | « chrome/browser/io_thread.cc ('k') | chrome/browser/net/gaia/gaia_oauth_fetcher_unittest.cc » ('j') | chrome/browser/password_manager/password_store_x_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc

diff --git a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc

index 424ed86d3ffbce2994528d8e7feaaa0849be4087..0064cf3ae72573fda965eac79b60ed724c3a1305 100644

--- a/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc

+++ b/chrome/browser/managed_mode/managed_user_refresh_token_fetcher_unittest.cc

@@ -4,13 +4,12 @@

#include "base/bind.h"

#include "base/memory/scoped_ptr.h"

-#include "base/message_loop.h"

#include "base/strings/stringprintf.h"

#include "base/strings/utf_string_conversions.h"

#include "chrome/browser/managed_mode/managed_user_refresh_token_fetcher.h"

#include "chrome/browser/signin/oauth2_token_service.h"

#include "chrome/test/base/testing_profile.h"

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

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

#include "google_apis/gaia/gaia_oauth_client.h"

#include "google_apis/gaia/gaia_urls.h"

#include "google_apis/gaia/google_service_auth_error.h"

@@ -194,9 +193,7 @@ class ManagedUserRefreshTokenFetcherTest : public testing::Test {

void OnTokenFetched(const GoogleServiceAuthError& error,

const std::string& token);

- base::WeakPtrFactory<ManagedUserRefreshTokenFetcherTest> weak_ptr_factory_;

- base::MessageLoop message_loop_;

- content::TestBrowserThread ui_thread_;

+ content::TestBrowserThreadBundle thread_bundle_;

TestingProfile profile_;

MockOAuth2TokenService oauth2_token_service_;

net::TestURLFetcherFactory url_fetcher_factory_;

@@ -204,15 +201,15 @@ class ManagedUserRefreshTokenFetcherTest : public testing::Test {

GoogleServiceAuthError error_;

std::string token_;

+ base::WeakPtrFactory<ManagedUserRefreshTokenFetcherTest> weak_ptr_factory_;

};

ManagedUserRefreshTokenFetcherTest::ManagedUserRefreshTokenFetcherTest()

- : weak_ptr_factory_(this),

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

- token_fetcher_(

+ : token_fetcher_(

ManagedUserRefreshTokenFetcher::Create(&oauth2_token_service_,

profile_.GetRequestContext())),

- error_(GoogleServiceAuthError::NONE) {}

+ error_(GoogleServiceAuthError::NONE),

+ weak_ptr_factory_(this) {}

void ManagedUserRefreshTokenFetcherTest::StartFetching() {

token_fetcher_->Start(kManagedUserId, UTF8ToUTF16(kName), kDeviceName,