[Sync] ModelTypeStore factory shouldn't require valid PSS to function correctly

components/sync/driver/sync_service_base.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/sync/driver/sync_service_base.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/path_service.h"
 #include "base/syslog_logging.h"
 #include "components/invalidation/public/invalidation_service.h"
 #include "components/sync/base/report_unrecoverable_error.h"
 #include "components/sync/device_info/local_device_info_provider.h"
 #include "components/sync/driver/sync_driver_switches.h"
 #include "components/sync/engine/engine_components_factory_impl.h"
 
 namespace syncer {
 
 namespace {
 
 const base::FilePath::CharType kSyncDataFolderName[] =
     FILE_PATH_LITERAL("Sync Data");
 
+const base::FilePath::CharType kLevelDBFolderName[] =
+    FILE_PATH_LITERAL("LevelDB");
+
 EngineComponentsFactory::Switches EngineSwitchesFromCommandLine() {
   EngineComponentsFactory::Switches factory_switches = {
       EngineComponentsFactory::ENCRYPTION_KEYSTORE,
       EngineComponentsFactory::BACKOFF_NORMAL};
 
   base::CommandLine* cl = base::CommandLine::ForCurrentProcess();
   if (cl->HasSwitch(switches::kSyncShortInitialRetryOverride)) {
     factory_switches.backoff_override =
         EngineComponentsFactory::BACKOFF_SHORT_INITIAL_RETRY_OVERRIDE;
   }
@@ skipping 12 matching lines @@
 
 SyncServiceBase::SyncServiceBase(std::unique_ptr<SyncClient> sync_client,
                                  std::unique_ptr<SigninManagerWrapper> signin,
                                  const version_info::Channel& channel,
                                  const base::FilePath& base_directory,
                                  const std::string& debug_identifier)
     : sync_client_(std::move(sync_client)),
       signin_(std::move(signin)),
       channel_(channel),
       base_directory_(base_directory),
-      sync_data_folder_(
-          base_directory_.Append(base::FilePath(kSyncDataFolderName))),
       debug_identifier_(debug_identifier),
       sync_prefs_(sync_client_->GetPrefService()) {
   ResetCryptoState();
 }
 
 SyncServiceBase::~SyncServiceBase() = default;
 
 void SyncServiceBase::AddObserver(SyncServiceObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.AddObserver(observer);
 }
 
 void SyncServiceBase::RemoveObserver(SyncServiceObserver* observer) {
   DCHECK(thread_checker_.CalledOnValidThread());
   observers_.RemoveObserver(observer);
 }
 
+// static
+base::FilePath SyncServiceBase::FormatSyncDataPath(
+    const base::FilePath& base_directory) {
+  return base_directory.Append(base::FilePath(kSyncDataFolderName));
+}
+
+// static
+base::FilePath SyncServiceBase::FormatSharedModelTypeStorePath(
+    const base::FilePath& base_directory) {
+  return FormatSyncDataPath(base_directory)
+      .Append(base::FilePath(kLevelDBFolderName));
+}
+
 bool SyncServiceBase::HasObserver(const SyncServiceObserver* observer) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   return observers_.HasObserver(observer);
 }
 
 void SyncServiceBase::NotifyObservers() {
   for (auto& observer : observers_) {
     observer.OnStateChanged(this);
   }
 }
@@ skipping 50 matching lines @@
 void SyncServiceBase::ResetCryptoState() {
   crypto_ = base::MakeUnique<SyncServiceCrypto>(
       base::BindRepeating(&SyncServiceBase::NotifyObservers,
                           base::Unretained(this)),
       base::BindRepeating(&SyncService::GetPreferredDataTypes,
                           base::Unretained(this)),
       &sync_prefs_);
 }
 
 }  // namespace syncer