Signed settings refactoring: Proper caching and more tests.

chrome/browser/ui/webui/options/chromeos/system_settings_provider.cc

 // Copyright (c) 2011 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/ui/webui/options/chromeos/system_settings_provider.h"
 
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/lazy_instance.h"
@@ skipping 171 matching lines @@
 }  // namespace anonymous
 
 namespace chromeos {
 
 SystemSettingsProvider::SystemSettingsProvider() {
   for (size_t i = 0; i < arraysize(kTimeZones); i++) {
     timezones_.push_back(icu::TimeZone::createTimeZone(
         icu::UnicodeString(kTimeZones[i], -1, US_INV)));
   }
   system::TimezoneSettings::GetInstance()->AddObserver(this);
-
+  timezone_value_.reset(base::Value::CreateStringValue(GetKnownTimezoneID(
+      system::TimezoneSettings::GetInstance()->GetTimezone())));
 }
 
 SystemSettingsProvider::~SystemSettingsProvider() {
   system::TimezoneSettings::GetInstance()->RemoveObserver(this);
   STLDeleteElements(&timezones_);
 }
 
 void SystemSettingsProvider::DoSet(const std::string& path,
                                    const base::Value& in_value) {
   // Non-guest users can change the time zone.
   if (UserManager::Get()->IsLoggedInAsGuest())
     return;
 
   if (path == kSystemTimezone) {
     string16 value;
     if (!in_value.IsType(Value::TYPE_STRING) || !in_value.GetAsString(&value))
       return;
     const icu::TimeZone* timezone = GetTimezone(value);
     if (!timezone)
       return;
     system::TimezoneSettings::GetInstance()->SetTimezone(*timezone);
+    timezone_value_.reset(
+        base::Value::CreateStringValue(GetKnownTimezoneID(*timezone)));
   }
 }
 
 const base::Value* SystemSettingsProvider::Get(const std::string& path) const {
-  if (path == kSystemTimezone) {
-    // TODO(pastarmovj): Cache this in the local_state instead of locally.
-    system_timezone_.reset(base::Value::CreateStringValue(GetKnownTimezoneID(
-        system::TimezoneSettings::GetInstance()->GetTimezone())));
-    return system_timezone_.get();
-  }
+  if (path == kSystemTimezone)
+    return timezone_value_.get();
   return NULL;
 }
 
 // The timezone is always trusted.
 bool SystemSettingsProvider::GetTrusted(const std::string& path,
-                                        const base::Closure& callback) const {
+                                        const base::Closure& callback) {
   return true;
 }
 
 bool SystemSettingsProvider::HandlesSetting(const std::string& path) const {
   return path == kSystemTimezone;
 }
 
+void SystemSettingsProvider::Reload() {
+  // TODO(pastarmovj): We can actually cache the timezone here to make returning
+  // it faster.
+}
+
 void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) {
   // Fires system setting change notification.
+  timezone_value_.reset(
+      base::Value::CreateStringValue(GetKnownTimezoneID(timezone)));
   CrosSettings::Get()->FireObservers(kSystemTimezone);
 }
 
 ListValue* SystemSettingsProvider::GetTimezoneList() {
   ListValue* timezoneList = new ListValue();
   for (std::vector<icu::TimeZone*>::iterator iter = timezones_.begin();
        iter != timezones_.end(); ++iter) {
     const icu::TimeZone* timezone = *iter;
     ListValue* option = new ListValue();
     option->Append(Value::CreateStringValue(GetTimezoneID(*timezone)));
@@ skipping 67 matching lines @@
     const icu::TimeZone* known_timezone = *iter;
     if (known_timezone->hasSameRules(timezone))
       return GetTimezoneID(*known_timezone);
   }
 
   // Not able to find a matching timezone in our list.
   return string16();
 }
 
 }  // namespace chromeos