Expand the JsonPrefStore's interface to allow for an alternate filename to be specified.

chrome/browser/prefs/profile_pref_store_manager.cc

 // Copyright 2014 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 "chrome/browser/prefs/profile_pref_store_manager.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/json/json_file_value_serializer.h"
 #include "base/logging.h"
@@ skipping 139 matching lines @@
 
   PrefHashFilter* raw_unprotected_pref_hash_filter =
       unprotected_pref_hash_filter.get();
   PrefHashFilter* raw_protected_pref_hash_filter =
       protected_pref_hash_filter.get();
 
   scoped_refptr<JsonPrefStore> unprotected_pref_store(
       new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
                         io_task_runner,
                         unprotected_pref_hash_filter.PassAs<PrefFilter>()));
+  // TODO(gab): Remove kDeprecatedProtectedPreferencesFilename as an alternate
+  // file in M40+.
   scoped_refptr<JsonPrefStore> protected_pref_store(new JsonPrefStore(
-      profile_path_.Append(chrome::kProtectedPreferencesFilename),
+      profile_path_.Append(chrome::kSecurePreferencesFilename),
+      profile_path_.Append(chrome::kDeprecatedProtectedPreferencesFilename),
       io_task_runner,
       protected_pref_hash_filter.PassAs<PrefFilter>()));
 
   SetupTrackedPreferencesMigration(
       unprotected_pref_names,
       protected_pref_names,
       base::Bind(&JsonPrefStore::RemoveValueSilently,
                  unprotected_pref_store->AsWeakPtr()),
       base::Bind(&JsonPrefStore::RemoveValueSilently,
                  protected_pref_store->AsWeakPtr()),
@@ skipping 59 matching lines @@
 scoped_ptr<PrefHashStoreImpl> ProfilePrefStoreManager::GetPrefHashStoreImpl() {
   DCHECK(kPlatformSupportsPreferenceTracking);
 
   return make_scoped_ptr(new PrefHashStoreImpl(
       seed_,
       device_id_,
       scoped_ptr<HashStoreContents>(new PrefServiceHashStoreContents(
           profile_path_.AsUTF8Unsafe(), local_state_)),
       true));
 }