diff options
| author | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 02:54:50 +0000 |
|---|---|---|
| committer | rsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-27 02:54:50 +0000 |
| commit | c63b8767eee8a73a7fc6bc62facb4eb37bff0079 (patch) | |
| tree | 9730f5673ca2edc8ff81e0bd061250d05b48fe7d | |
| parent | 1a8ddd29123ad82887544169f19214260618aec8 (diff) | |
| download | chromium_src-c63b8767eee8a73a7fc6bc62facb4eb37bff0079.zip chromium_src-c63b8767eee8a73a7fc6bc62facb4eb37bff0079.tar.gz chromium_src-c63b8767eee8a73a7fc6bc62facb4eb37bff0079.tar.bz2 | |
Merge 72574 - Pass empty cros_user string to GetProfileSyncService() in sync integration tests
The sync integration tests are broken on chrome OS because a cros_string
is not being passed to GetProfileSyncService() in
ProfileSyncServiceHarness::SetupSync(), causing no ProfileSyncService
object to be returned.
This patch passes an empty cros_user string to GetProfileSyncService(),
thereby fixing the sync integration tests on chrome OS.
BUG=70854, chromium-os:11319, chromium-os:9262
TEST=sync_integration_tests
Review URL: http://codereview.chromium.org/6248019
TBR=rsimha@chromium.org
Review URL: http://codereview.chromium.org/6272023
git-svn-id: svn://svn.chromium.org/chrome/branches/648/src@72753 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/sync/profile_sync_service_harness.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/sync/profile_sync_service_harness.cc b/chrome/browser/sync/profile_sync_service_harness.cc index 6f2cb90..449b1bc 100644 --- a/chrome/browser/sync/profile_sync_service_harness.cc +++ b/chrome/browser/sync/profile_sync_service_harness.cc @@ -130,7 +130,7 @@ bool ProfileSyncServiceHarness::SetupSync() { bool ProfileSyncServiceHarness::SetupSync( const syncable::ModelTypeSet& synced_datatypes) { // Initialize the sync client's profile sync service object. - service_ = profile_->GetProfileSyncService(); + service_ = profile_->GetProfileSyncService(""); if (service_ == NULL) { LOG(ERROR) << "SetupSync(): service_ is null."; return false; |