[SyncFS] Dispatch backend settings to correct backend.

Dispatch ConflictResolutionPolicy setting to correct backend.
Also relay sync_enabled flag to V2 backend on initialization.

BUG=347424
NOTRY=true

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@255566 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 7 insertions, 5 deletions

diff --git a/chrome/browser/sync_file_system/sync_file_system_service.cc b/chrome/browser/sync_file_system/sync_file_system_service.cc
index 4abb7a3..f0be2b0 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.cc
+++ b/chrome/browser/sync_file_system/sync_file_system_service.cc
@@ -382,14 +382,14 @@ void SyncFileSystemService::RemoveSyncEventObserver(
 }
 
 ConflictResolutionPolicy SyncFileSystemService::GetConflictResolutionPolicy(
-    const GURL& origin) const {
-  return remote_service_->GetConflictResolutionPolicy(origin);
+    const GURL& origin) {
+  return GetRemoteService(origin)->GetConflictResolutionPolicy(origin);
 }
 
 SyncStatusCode SyncFileSystemService::SetConflictResolutionPolicy(
     const GURL& origin,
     ConflictResolutionPolicy policy) {
-  return remote_service_->SetConflictResolutionPolicy(origin, policy);
+  return GetRemoteService(origin)->SetConflictResolutionPolicy(origin, policy);
 }
 
 LocalChangeProcessor* SyncFileSystemService::GetLocalChangeProcessor(
@@ -765,6 +765,9 @@ RemoteFileSyncService* SyncFileSystemService::GetRemoteService(
     v2_remote_service_->AddServiceObserver(v2_remote_syncer.get());
     v2_remote_service_->AddFileStatusObserver(this);
     v2_remote_service_->SetRemoteChangeProcessor(local_service_.get());
+    v2_remote_service_->SetSyncEnabled(sync_enabled_);
+    v2_remote_service_->SetDefaultConflictResolutionPolicy(
+        remote_service_->GetDefaultConflictResolutionPolicy());
     remote_sync_runners_.push_back(v2_remote_syncer.release());
   }
   return v2_remote_service_.get();
diff --git a/chrome/browser/sync_file_system/sync_file_system_service.h b/chrome/browser/sync_file_system/sync_file_system_service.h
index a5132e7..4359d25 100644
--- a/chrome/browser/sync_file_system/sync_file_system_service.h
+++ b/chrome/browser/sync_file_system/sync_file_system_service.h
@@ -71,8 +71,7 @@ class SyncFileSystemService
   void AddSyncEventObserver(SyncEventObserver* observer);
   void RemoveSyncEventObserver(SyncEventObserver* observer);
 
-  ConflictResolutionPolicy GetConflictResolutionPolicy(
-      const GURL& origin) const;
+  ConflictResolutionPolicy GetConflictResolutionPolicy(const GURL& origin);
   SyncStatusCode SetConflictResolutionPolicy(const GURL& origin,
                                              ConflictResolutionPolicy policy);