Upstream version 7.35.139.0

[platform/framework/web/crosswalk.git] / src / base / prefs / pref_service.cc

diff --git a/src/base/prefs/pref_service.cc b/src/base/prefs/pref_service.cc
index 8a2c742..a8e56d0 100644 (file)
--- a/src/base/prefs/pref_service.cc
+++ b/src/base/prefs/pref_service.cc
@@ -67,7 +67,9 @@ PrefService::~PrefService() {
 }
 
 void PrefService::InitFromStorage(bool async) {
-  if (!async) {
+  if (user_pref_store_->IsInitializationComplete()) {
+    read_error_callback_.Run(user_pref_store_->GetReadError());
+  } else if (!async) {
     read_error_callback_.Run(user_pref_store_->ReadPrefs());
   } else {
     // Guarantee that initialization happens after this function returned.