Commit a81bbedf authored by tzik's avatar tzik Committed by Commit bot

Remove SyncFileSystemservice::GetRemoteService

This function used to be used to support multiple backends, and is no
longer used.

BUG=

Review URL: https://codereview.chromium.org/900133003

Cr-Commit-Position: refs/heads/master@{#314751}
parent b87b6106
...@@ -323,7 +323,7 @@ void SyncFileSystemService::DumpDatabase(const DumpFilesCallback& callback) { ...@@ -323,7 +323,7 @@ void SyncFileSystemService::DumpDatabase(const DumpFilesCallback& callback) {
void SyncFileSystemService::GetFileSyncStatus( void SyncFileSystemService::GetFileSyncStatus(
const FileSystemURL& url, const SyncFileStatusCallback& callback) { const FileSystemURL& url, const SyncFileStatusCallback& callback) {
DCHECK(local_service_); DCHECK(local_service_);
DCHECK(GetRemoteService(url.origin())); DCHECK(remote_service_);
// It's possible to get an invalid FileEntry. // It's possible to get an invalid FileEntry.
if (!url.is_valid()) { if (!url.is_valid()) {
...@@ -352,7 +352,7 @@ void SyncFileSystemService::RemoveSyncEventObserver( ...@@ -352,7 +352,7 @@ void SyncFileSystemService::RemoveSyncEventObserver(
LocalChangeProcessor* SyncFileSystemService::GetLocalChangeProcessor( LocalChangeProcessor* SyncFileSystemService::GetLocalChangeProcessor(
const GURL& origin) { const GURL& origin) {
return GetRemoteService(origin)->GetLocalChangeProcessor(); return remote_service_->GetLocalChangeProcessor();
} }
void SyncFileSystemService::OnSyncIdle() { void SyncFileSystemService::OnSyncIdle() {
...@@ -525,7 +525,7 @@ void SyncFileSystemService::DidRegisterOrigin( ...@@ -525,7 +525,7 @@ void SyncFileSystemService::DidRegisterOrigin(
if (status == SYNC_STATUS_FAILED) { if (status == SYNC_STATUS_FAILED) {
// If we got generic error return the service status information. // If we got generic error return the service status information.
switch (GetRemoteService(app_origin)->GetCurrentState()) { switch (remote_service_->GetCurrentState()) {
case REMOTE_SERVICE_AUTHENTICATION_REQUIRED: case REMOTE_SERVICE_AUTHENTICATION_REQUIRED:
callback.Run(SYNC_STATUS_AUTHENTICATION_FAILED); callback.Run(SYNC_STATUS_AUTHENTICATION_FAILED);
return; return;
...@@ -556,7 +556,7 @@ void SyncFileSystemService::DidInitializeFileSystemForDump( ...@@ -556,7 +556,7 @@ void SyncFileSystemService::DidInitializeFileSystemForDump(
return; return;
} }
GetRemoteService(origin)->DumpFiles( remote_service_->DumpFiles(
origin, origin,
base::Bind( base::Bind(
&SyncFileSystemService::DidDumpFiles, &SyncFileSystemService::DidDumpFiles,
...@@ -682,7 +682,7 @@ void SyncFileSystemService::OnExtensionUnloaded( ...@@ -682,7 +682,7 @@ void SyncFileSystemService::OnExtensionUnloaded(
DVLOG(1) << "Handle extension notification for UNLOAD(DISABLE): " DVLOG(1) << "Handle extension notification for UNLOAD(DISABLE): "
<< app_origin; << app_origin;
GetRemoteService(app_origin)->DisableOrigin( remote_service_->DisableOrigin(
app_origin, app_origin,
base::Bind(&DidHandleUnloadedEvent, app_origin)); base::Bind(&DidHandleUnloadedEvent, app_origin));
local_service_->SetOriginEnabled(app_origin, false); local_service_->SetOriginEnabled(app_origin, false);
...@@ -705,7 +705,7 @@ void SyncFileSystemService::OnExtensionUninstalled( ...@@ -705,7 +705,7 @@ void SyncFileSystemService::OnExtensionUninstalled(
GURL app_origin = Extension::GetBaseURLFromExtensionId(extension->id()); GURL app_origin = Extension::GetBaseURLFromExtensionId(extension->id());
DVLOG(1) << "Handle extension notification for UNINSTALLED: " DVLOG(1) << "Handle extension notification for UNINSTALLED: "
<< app_origin; << app_origin;
GetRemoteService(app_origin)->UninstallOrigin( remote_service_->UninstallOrigin(
app_origin, flag, app_origin, flag,
base::Bind(&DidHandleUninstalledEvent, app_origin)); base::Bind(&DidHandleUninstalledEvent, app_origin));
local_service_->SetOriginEnabled(app_origin, false); local_service_->SetOriginEnabled(app_origin, false);
...@@ -716,7 +716,7 @@ void SyncFileSystemService::OnExtensionLoaded( ...@@ -716,7 +716,7 @@ void SyncFileSystemService::OnExtensionLoaded(
const Extension* extension) { const Extension* extension) {
GURL app_origin = Extension::GetBaseURLFromExtensionId(extension->id()); GURL app_origin = Extension::GetBaseURLFromExtensionId(extension->id());
DVLOG(1) << "Handle extension notification for LOADED: " << app_origin; DVLOG(1) << "Handle extension notification for LOADED: " << app_origin;
GetRemoteService(app_origin)->EnableOrigin( remote_service_->EnableOrigin(
app_origin, app_origin,
base::Bind(&DidHandleLoadEvent, app_origin)); base::Bind(&DidHandleLoadEvent, app_origin));
local_service_->SetOriginEnabled(app_origin, true); local_service_->SetOriginEnabled(app_origin, true);
...@@ -764,9 +764,4 @@ void SyncFileSystemService::RunForEachSyncRunners( ...@@ -764,9 +764,4 @@ void SyncFileSystemService::RunForEachSyncRunners(
((*iter)->*method)(); ((*iter)->*method)();
} }
RemoteFileSyncService* SyncFileSystemService::GetRemoteService(
const GURL& origin) {
return remote_service_.get();
}
} // namespace sync_file_system } // namespace sync_file_system
...@@ -163,10 +163,6 @@ class SyncFileSystemService ...@@ -163,10 +163,6 @@ class SyncFileSystemService
// and Remote sync). // and Remote sync).
void RunForEachSyncRunners(void(SyncProcessRunner::*method)()); void RunForEachSyncRunners(void(SyncProcessRunner::*method)());
// Returns the appropriate RemoteFileSyncService for the given origin/app.
// (crbug.com/324215)
RemoteFileSyncService* GetRemoteService(const GURL& origin);
Profile* profile_; Profile* profile_;
scoped_ptr<LocalFileSyncService> local_service_; scoped_ptr<LocalFileSyncService> local_service_;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment