Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / chromecast / common / chromecast_config.cc

diff --git a/src/chromecast/common/chromecast_config.cc b/src/chromecast/common/chromecast_config.cc
index dfb3866..af5a591 100644 (file)
--- a/src/chromecast/common/chromecast_config.cc
+++ b/src/chromecast/common/chromecast_config.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/command_line.h"
-#include "base/file_util.h"
+#include "base/files/file_util.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/prefs/json_pref_store.h"
@@ -17,6 +17,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "chromecast/common/cast_paths.h"
 #include "chromecast/common/pref_names.h"
+#include "chromecast/metrics/cast_metrics_prefs.h"
 
 namespace chromecast {
 
@@ -74,13 +75,15 @@ bool ChromecastConfig::Load(PrefRegistrySimple* registry) {
   VLOG(1) << "Loading config from " << config_path_.value();
   registry->RegisterIntegerPref(prefs::kRemoteDebuggingPort, 0);
 
+  metrics::RegisterPrefs(registry);
   RegisterPlatformPrefs(registry);
 
   PersistentPrefStore::PrefReadError prefs_read_error =
       PersistentPrefStore::PREF_READ_ERROR_NONE;
   base::PrefServiceFactory prefServiceFactory;
-  prefServiceFactory.SetUserPrefsFile(config_path_,
-      JsonPrefStore::GetTaskRunnerForFile(config_path_, worker_pool_));
+  scoped_refptr<base::SequencedTaskRunner> task_runner =
+      JsonPrefStore::GetTaskRunnerForFile(config_path_, worker_pool_.get());
+  prefServiceFactory.SetUserPrefsFile(config_path_, task_runner.get());
   prefServiceFactory.set_async(false);
   prefServiceFactory.set_read_error_callback(
       base::Bind(&UserPrefsLoadError, &prefs_read_error));
@@ -135,4 +138,9 @@ void ChromecastConfig::SetIntValue(const std::string& key, int value) const {
   }
 }
 
+bool ChromecastConfig::HasValue(const std::string& key) const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  return pref_service_->HasPrefPath(key.c_str());
+}
+
 }  // namespace chromecast