chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc - Issue 19511002: Change google_api::RequestSender to take an AuthService instead of a Profile.

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/chromeos/contacts/gdata_contacts_service_unittest.cc

Issue 19511002: Change google_api::RequestSender to take an AuthService instead of a Profile. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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/chromeos/contacts/gdata_contacts_service_stub.cc ('k') | chrome/browser/chromeos/contacts/google_contact_store.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc

diff --git a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc

index ac43ff8e35c5a3cf12660cf31bac706747702641..51ba9560bcad3b840f5463ee0ee5e69fa36ae0f9 100644

--- a/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc

+++ b/chrome/browser/chromeos/contacts/gdata_contacts_service_unittest.cc

@@ -11,13 +11,11 @@

#include "base/time/time.h"

#include "chrome/browser/chromeos/contacts/contact.pb.h"

#include "chrome/browser/chromeos/contacts/contact_test_util.h"

-#include "chrome/browser/google_apis/auth_service.h"

+#include "chrome/browser/google_apis/dummy_auth_service.h"

#include "chrome/browser/google_apis/test_util.h"

#include "chrome/browser/google_apis/time_util.h"

-#include "chrome/browser/profiles/profile.h"

#include "chrome/browser/ui/browser.h"

#include "chrome/test/base/in_process_browser_test.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_utils.h"

@@ -78,7 +76,6 @@ class GDataContactsServiceTest : public testing::Test {

virtual void SetUp() OVERRIDE {

io_thread_.StartIOThread();

- profile_.reset(new TestingProfile);

request_context_getter_ = new net::TestURLRequestContextGetter(

content::BrowserThread::GetMessageLoopProxyForThread(

content::BrowserThread::IO));

@@ -92,10 +89,7 @@ class GDataContactsServiceTest : public testing::Test {

base::Bind(&GDataContactsServiceTest::HandleDownloadRequest,

base::Unretained(this)));

service_.reset(new GDataContactsService(request_context_getter_.get(),

- profile_.get()));

- service_->Initialize();

- service_->auth_service_for_testing()->set_access_token_for_testing(

- kTestGDataAuthToken);

+ new google_apis::DummyAuthService));

service_->set_rewrite_photo_url_callback_for_testing(

base::Bind(&GDataContactsServiceTest::RewritePhotoUrl,

base::Unretained(this)));

@@ -176,7 +170,6 @@ class GDataContactsServiceTest : public testing::Test {

base::MessageLoopForUI message_loop_;

content::TestBrowserThread ui_thread_;

content::TestBrowserThread io_thread_;

- scoped_ptr<TestingProfile> profile_;

scoped_refptr<net::TestURLRequestContextGetter> request_context_getter_;

// Was the last download successful? Used to pass the result back from