diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-11-28 11:55:43 +0000 |
| commit | f2477e01787aa58f445919b809d89e252beef54f (patch) | |
| tree | 2db962b4af39f0db3a5f83b314373d0530c484b8 /chrome/browser/sync/abstract_profile_sync_service_test.cc | |
| parent | 7daea1dd5ff7e419322de831b642d81af3247912 (diff) | |
| download | chromium_org-f2477e01787aa58f445919b809d89e252beef54f.tar.gz | |
Merge from Chromium at DEPS revision 237746
This commit was generated by merge_to_master.py.
Change-Id: I8997af4cddfeb09a7c26f7e8e672c712cab461ea
Diffstat (limited to 'chrome/browser/sync/abstract_profile_sync_service_test.cc')
| -rw-r--r-- | chrome/browser/sync/abstract_profile_sync_service_test.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc index 8de5c6bea9..c57ccd9f56 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc @@ -45,7 +45,6 @@ AbstractProfileSyncServiceTest::AbstractProfileSyncServiceTest() : thread_bundle_(content::TestBrowserThreadBundle::REAL_DB_THREAD | content::TestBrowserThreadBundle::REAL_FILE_THREAD | content::TestBrowserThreadBundle::REAL_IO_THREAD), - token_service_(NULL), sync_service_(NULL) { } @@ -67,12 +66,6 @@ bool AbstractProfileSyncServiceTest::CreateRoot(ModelType model_type) { sync_service_->GetUserShare()); } -// static -BrowserContextKeyedService* AbstractProfileSyncServiceTest::BuildTokenService( - content::BrowserContext* profile) { - return new TokenService; -} - CreateRootHelper::CreateRootHelper(AbstractProfileSyncServiceTest* test, ModelType model_type) : callback_(base::Bind(&CreateRootHelper::CreateRootCallback, |