Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / prefs / profile_pref_store_manager.cc

diff --git a/src/chrome/browser/prefs/profile_pref_store_manager.cc b/src/chrome/browser/prefs/profile_pref_store_manager.cc
index 6cf987c..04f4b77 100644 (file)
--- a/src/chrome/browser/prefs/profile_pref_store_manager.cc
+++ b/src/chrome/browser/prefs/profile_pref_store_manager.cc
@@ -13,7 +13,7 @@
 #include "base/prefs/json_pref_store.h"
 #include "base/prefs/persistent_pref_store.h"
 #include "base/prefs/pref_registry_simple.h"
-#include "chrome/browser/prefs/pref_hash_store_impl.h"
+#include "chrome/browser/prefs/tracked/pref_hash_store_impl.h"
 #include "chrome/browser/prefs/tracked/pref_service_hash_store_contents.h"
 #include "chrome/browser/prefs/tracked/segregated_pref_store.h"
 #include "chrome/browser/prefs/tracked/tracked_preferences_migration.h"
@@ -133,14 +133,14 @@ PersistentPrefStore* ProfilePrefStoreManager::CreateProfilePrefStore(
   scoped_refptr<JsonPrefStore> unprotected_pref_store(
       new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
                         io_task_runner.get(),
-                        unprotected_pref_hash_filter.PassAs<PrefFilter>()));
+                        unprotected_pref_hash_filter.Pass()));
   // TODO(gab): Remove kDeprecatedProtectedPreferencesFilename as an alternate
   // file in M40+.
   scoped_refptr<JsonPrefStore> protected_pref_store(new JsonPrefStore(
       profile_path_.Append(chrome::kSecurePreferencesFilename),
       profile_path_.Append(chrome::kProtectedPreferencesFilenameDeprecated),
       io_task_runner.get(),
-      protected_pref_hash_filter.PassAs<PrefFilter>()));
+      protected_pref_hash_filter.Pass()));
 
   SetupTrackedPreferencesMigration(
       unprotected_pref_names,
@@ -211,13 +211,12 @@ ProfilePrefStoreManager::CreateDeprecatedCombinedProfilePrefStore(
     pref_hash_store_impl->set_legacy_hash_store_contents(
         scoped_ptr<HashStoreContents>(new PrefServiceHashStoreContents(
             profile_path_.AsUTF8Unsafe(), local_state_)));
-    pref_filter.reset(
-        new PrefHashFilter(pref_hash_store_impl.PassAs<PrefHashStore>(),
-                           tracking_configuration_,
-                           base::Closure(),
-                           NULL,
-                           reporting_ids_count_,
-                           false));
+    pref_filter.reset(new PrefHashFilter(pref_hash_store_impl.Pass(),
+                                         tracking_configuration_,
+                                         base::Closure(),
+                                         NULL,
+                                         reporting_ids_count_,
+                                         false));
   }
   return new JsonPrefStore(GetPrefFilePathFromProfilePath(profile_path_),
                            io_task_runner.get(),