summaryrefslogtreecommitdiffstats
path: root/chrome/test/testing_profile.h
diff options
context:
space:
mode:
authorchron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 01:24:45 +0000
committerchron@chromium.org <chron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-14 01:24:45 +0000
commit8e4c296105bc8dda25002951118298bcfab1b88b (patch)
tree502aff4ec60c64c7912c1a977febbac41d9b0d41 /chrome/test/testing_profile.h
parent706bf7278b50b4292555e55adbf255b7aa49b12a (diff)
downloadchromium_src-8e4c296105bc8dda25002951118298bcfab1b88b.zip
chromium_src-8e4c296105bc8dda25002951118298bcfab1b88b.tar.gz
chromium_src-8e4c296105bc8dda25002951118298bcfab1b88b.tar.bz2
Add the TokenService to the chrome profile, and use it to pass the LSID from ChromiumOS login into Sync.
This is just initial groundlaying for replacing the internal sync auth stack. IssueAuthToken is not yet used in this CL. TEST=Run chromium OS. Login using your credentials. Verify that sync works in about:sync. BUG=47093 Review URL: http://codereview.chromium.org/2872034 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/testing_profile.h')
-rw-r--r--chrome/test/testing_profile.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 67f85a2..8421570 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -283,6 +283,7 @@ class TestingProfile : public Profile {
void BlockUntilHistoryProcessesPendingRequests();
// Creates and initializes a profile sync service if the tests require one.
+ virtual TokenService* GetTokenService();
virtual ProfileSyncService* GetProfileSyncService();
virtual CloudPrintProxyService* GetCloudPrintProxyService() { return NULL; }
@@ -314,6 +315,9 @@ class TestingProfile : public Profile {
// The BookmarkModel. Only created if CreateBookmarkModel is invoked.
scoped_ptr<BookmarkModel> bookmark_bar_model_;
+ // The TokenService. Created by CreateTokenService. Filled with dummy data.
+ scoped_ptr<TokenService> token_service_;
+
// The ProfileSyncService. Created by CreateProfileSyncService.
scoped_ptr<ProfileSyncService> profile_sync_service_;