summaryrefslogtreecommitdiffstats
path: root/sync
diff options
context:
space:
mode:
authorrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 07:24:46 +0000
committerrlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-08-09 07:24:46 +0000
commitc39863f6f5e1f5919e5eefbfe523803804c87500 (patch)
treee5d5c7006a07ce1b5da3908cff6836d3393538b6 /sync
parente79f26e79c7a547daea7ffb9fed3755b82641077 (diff)
downloadchromium_src-c39863f6f5e1f5919e5eefbfe523803804c87500.zip
chromium_src-c39863f6f5e1f5919e5eefbfe523803804c87500.tar.gz
chromium_src-c39863f6f5e1f5919e5eefbfe523803804c87500.tar.bz2
Remove SyncManager::Init() return value
The return value was almost entirely unusued. Success or failure is reported through a parameter in the asynchronous callback function. BUG=140180 Review URL: https://chromiumcodereview.appspot.com/10826193 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150763 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync')
-rw-r--r--sync/internal_api/public/sync_manager.h2
-rw-r--r--sync/internal_api/public/test/fake_sync_manager.h2
-rw-r--r--sync/internal_api/sync_manager_impl.cc6
-rw-r--r--sync/internal_api/sync_manager_impl.h2
-rw-r--r--sync/internal_api/test/fake_sync_manager.cc3
5 files changed, 7 insertions, 8 deletions
diff --git a/sync/internal_api/public/sync_manager.h b/sync/internal_api/public/sync_manager.h
index 1fccac4..0cb6a4c 100644
--- a/sync/internal_api/public/sync_manager.h
+++ b/sync/internal_api/public/sync_manager.h
@@ -363,7 +363,7 @@ class SyncManager {
//
// TODO(akalin): Replace the |post_factory| parameter with a
// URLFetcher parameter.
- virtual bool Init(
+ virtual void Init(
const FilePath& database_location,
const WeakHandle<JsEventHandler>& event_handler,
const std::string& sync_server_and_path,
diff --git a/sync/internal_api/public/test/fake_sync_manager.h b/sync/internal_api/public/test/fake_sync_manager.h
index cbc8b56..12f3f70 100644
--- a/sync/internal_api/public/test/fake_sync_manager.h
+++ b/sync/internal_api/public/test/fake_sync_manager.h
@@ -66,7 +66,7 @@ class FakeSyncManager : public SyncManager {
// SyncManager implementation.
// Note: we treat whatever message loop this is called from as the sync
// loop for purposes of callbacks.
- virtual bool Init(
+ virtual void Init(
const FilePath& database_location,
const WeakHandle<JsEventHandler>& event_handler,
const std::string& sync_server_and_path,
diff --git a/sync/internal_api/sync_manager_impl.cc b/sync/internal_api/sync_manager_impl.cc
index 72f936f..16232f4 100644
--- a/sync/internal_api/sync_manager_impl.cc
+++ b/sync/internal_api/sync_manager_impl.cc
@@ -362,7 +362,7 @@ void SyncManagerImpl::ConfigureSyncer(
}
-bool SyncManagerImpl::Init(
+void SyncManagerImpl::Init(
const FilePath& database_location,
const WeakHandle<JsEventHandler>& event_handler,
const std::string& sync_server_and_path,
@@ -428,7 +428,8 @@ bool SyncManagerImpl::Init(
OnInitializationComplete(
MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()),
false, syncer::ModelTypeSet()));
- return false;
+ LOG(ERROR) << "Sync manager initialization failed!";
+ return;
}
connection_manager_.reset(new SyncAPIServerConnectionManager(
@@ -495,7 +496,6 @@ bool SyncManagerImpl::Init(
OnInitializationComplete(
MakeWeakHandle(weak_ptr_factory_.GetWeakPtr()),
true, InitialSyncEndedTypes()));
- return true;
}
void SyncManagerImpl::RefreshNigori(const std::string& chrome_version,
diff --git a/sync/internal_api/sync_manager_impl.h b/sync/internal_api/sync_manager_impl.h
index c09a498..d9bd8ab 100644
--- a/sync/internal_api/sync_manager_impl.h
+++ b/sync/internal_api/sync_manager_impl.h
@@ -58,7 +58,7 @@ class SyncManagerImpl : public SyncManager,
virtual ~SyncManagerImpl();
// SyncManager implementation.
- virtual bool Init(
+ virtual void Init(
const FilePath& database_location,
const WeakHandle<JsEventHandler>& event_handler,
const std::string& sync_server_and_path,
diff --git a/sync/internal_api/test/fake_sync_manager.cc b/sync/internal_api/test/fake_sync_manager.cc
index c9a742d..696746d 100644
--- a/sync/internal_api/test/fake_sync_manager.cc
+++ b/sync/internal_api/test/fake_sync_manager.cc
@@ -84,7 +84,7 @@ void FakeSyncManager::DisableNotifications(
}
}
-bool FakeSyncManager::Init(
+void FakeSyncManager::Init(
const FilePath& database_location,
const WeakHandle<JsEventHandler>& event_handler,
const std::string& sync_server_and_path,
@@ -111,7 +111,6 @@ bool FakeSyncManager::Init(
OnInitializationComplete(
syncer::WeakHandle<syncer::JsBackend>(),
true, initial_sync_ended_types_));
- return true;
}
void FakeSyncManager::ThrowUnrecoverableError() {