summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 00:49:34 +0000
committerrsimha@chromium.org <rsimha@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-26 00:49:34 +0000
commit5999c5a8d124d48c346cdaae12ef8a7128f6cab6 (patch)
tree54bf82d9452e40439f1d2c88bc77003740ffd0c9
parent5a8dffaba9d7fecdd74eda2c351299629d690913 (diff)
downloadchromium_src-5999c5a8d124d48c346cdaae12ef8a7128f6cab6.zip
chromium_src-5999c5a8d124d48c346cdaae12ef8a7128f6cab6.tar.gz
chromium_src-5999c5a8d124d48c346cdaae12ef8a7128f6cab6.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72574 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/sync/profile_sync_service_harness.cc2
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 4243c4c..95eaff1 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;