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 196 matching lines @@
     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);
   }
 }
 
-const base::Value* SystemSettingsProvider::Get(const std::string& path) 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();
+    return base::Value::CreateStringValue(GetKnownTimezoneID(
+        system::TimezoneSettings::GetInstance()->GetTimezone()));
   }
   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. This is not really so critical so for now we can leave it as is.

[Mattias Nissler (ping if slow), 2011/11/30 12:25:50]

Just remove the second sentence.

[pastarmovj, 2011/11/30 17:21:16]

Done.

+}
+
 void SystemSettingsProvider::TimezoneChanged(const icu::TimeZone& timezone) {
   // Fires system setting change notification.
   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;
@@ skipping 69 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