Unrevert r141537: Add extensions::StateStore and use that instead of

chrome/browser/extensions/api/alarms/alarm_manager.cc

 // Copyright (c) 2012 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/extensions/api/alarms/alarm_manager.h"
 
 #include "base/bind.h"
 #include "base/json/json_writer.h"
 #include "base/message_loop.h"
 #include "base/time.h"
+#include "base/value_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_event_router.h"
-#include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/state_store.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "content/public/browser/notification_service.h"
 
 namespace extensions {
 
 namespace {
 
 const char kOnAlarmEvent[] = "alarms.onAlarm";
 
+// A list of alarms that this extension has set.
+const char kRegisteredAlarms[] = "alarms";
+const char kAlarmScheduledRunTime[] = "scheduled_run_time";
+
 // The minimum period between polling for alarms to run.
 const base::TimeDelta kDefaultMinPollPeriod = base::TimeDelta::FromMinutes(5);
 
 class DefaultAlarmDelegate : public AlarmManager::Delegate {
  public:
   explicit DefaultAlarmDelegate(Profile* profile) : profile_(profile) {}
   virtual ~DefaultAlarmDelegate() {}
 
   virtual void OnAlarm(const std::string& extension_id,
                        const AlarmManager::Alarm& alarm) {
     ListValue args;
     std::string json_args;
     args.Append(alarm.ToValue().release());
     base::JSONWriter::Write(&args, &json_args);
     ExtensionSystem::Get(profile_)->event_router()->DispatchEventToExtension(
         extension_id, kOnAlarmEvent, json_args, NULL, GURL());
   }
 
  private:
   Profile* profile_;
 };
 
+// Contains the state we persist for each alarm.
+struct AlarmState {
+  linked_ptr<AlarmManager::Alarm> alarm;
+  base::Time scheduled_run_time;
+
+  AlarmState() {}
+  ~AlarmState() {}
+};
+
 // Creates a TimeDelta from a delay as specified in the API.
 base::TimeDelta TimeDeltaFromDelay(double delay_in_minutes) {
   return base::TimeDelta::FromMicroseconds(
       delay_in_minutes * base::Time::kMicrosecondsPerMinute);
 }
 
+std::vector<AlarmState> AlarmsFromValue(const base::ListValue* list) {
+  typedef AlarmManager::Alarm Alarm;
+  std::vector<AlarmState> alarms;
+  for (size_t i = 0; i < list->GetSize(); ++i) {
+    base::DictionaryValue* alarm_dict = NULL;
+    AlarmState alarm;
+    alarm.alarm.reset(new Alarm());
+    if (list->GetDictionary(i, &alarm_dict) &&
+        Alarm::Populate(*alarm_dict, alarm.alarm.get())) {
+      base::Value* time_value = NULL;
+      if (alarm_dict->Get(kAlarmScheduledRunTime, &time_value))
+        base::GetValueAsTime(*time_value, &alarm.scheduled_run_time);
+      alarms.push_back(alarm);
+    }
+  }
+  return alarms;
+}
+
+scoped_ptr<base::ListValue> AlarmsToValue(
+    const std::vector<AlarmState>& alarms) {
+  scoped_ptr<base::ListValue> list(new ListValue());
+  for (size_t i = 0; i < alarms.size(); ++i) {
+    scoped_ptr<base::DictionaryValue> alarm = alarms[i].alarm->ToValue().Pass();
+    alarm->Set(kAlarmScheduledRunTime,
+               base::CreateTimeValue(alarms[i].scheduled_run_time));
+    list->Append(alarm.release());
+  }
+  return list.Pass();
+}
+
+
 }  // namespace
 
 // AlarmManager
 
 AlarmManager::AlarmManager(Profile* profile)
     : profile_(profile),
       delegate_(new DefaultAlarmDelegate(profile)),
       last_poll_time_(base::Time()) {
   registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                  content::Source<Profile>(profile_));
+
+  StateStore* storage = ExtensionSystem::Get(profile_)->state_store();
+  if (storage)
+    storage->RegisterKey(kRegisteredAlarms);
 }
 
 AlarmManager::~AlarmManager() {
 }
 
 void AlarmManager::AddAlarm(const std::string& extension_id,
                             const linked_ptr<Alarm>& alarm) {
   base::TimeDelta alarm_time = TimeDeltaFromDelay(alarm->delay_in_minutes);
   AddAlarmImpl(extension_id, alarm, alarm_time);
-  WriteToPrefs(extension_id);
+  WriteToStorage(extension_id);
 }
 
 const AlarmManager::Alarm* AlarmManager::GetAlarm(
     const std::string& extension_id, const std::string& name) {
   AlarmIterator it = GetAlarmIterator(extension_id, name);
   if (it.first == alarms_.end())
     return NULL;
   return it.second->get();
 }
 
@@ skipping 20 matching lines @@
   return make_pair(alarms_.end(), AlarmList::iterator());
 }
 
 bool AlarmManager::RemoveAlarm(const std::string& extension_id,
                                const std::string& name) {
   AlarmIterator it = GetAlarmIterator(extension_id, name);
   if (it.first == alarms_.end())
     return false;
 
   RemoveAlarmIterator(it);
-  WriteToPrefs(extension_id);
+  WriteToStorage(extension_id);
   return true;
 }
 
 void AlarmManager::RemoveAllAlarms(const std::string& extension_id) {
   AlarmMap::iterator list = alarms_.find(extension_id);
   if (list == alarms_.end())
     return;
 
   // Note: I'm using indices rather than iterators here because
   // RemoveAlarmIterator will delete the list when it becomes empty.
   for (size_t i = 0, size = list->second.size(); i < size; ++i)
     RemoveAlarmIterator(AlarmIterator(list, list->second.begin()));
 
   CHECK(alarms_.find(extension_id) == alarms_.end());
-  WriteToPrefs(extension_id);
+  WriteToStorage(extension_id);
 }
 
 void AlarmManager::RemoveAlarmIterator(const AlarmIterator& iter) {
   // Cancel the timer if there are no more alarms.
   // We don't need to reschedule the poll otherwise, because in
   // the worst case we would just poll one extra time.
   scheduled_times_.erase(iter.second->get());
   if (scheduled_times_.empty())
     timer_.Stop();
 
@@ skipping 12 matching lines @@
   delegate_->OnAlarm(extension_id, *alarm);
 
   std::string extension_id_copy(extension_id);
   if (!alarm->repeating) {
     RemoveAlarmIterator(it);
   } else {
     // Update our scheduled time for the next alarm.
     scheduled_times_[alarm].time =
         last_poll_time_ + TimeDeltaFromDelay(alarm->delay_in_minutes);
   }
-  WriteToPrefs(extension_id_copy);
+  WriteToStorage(extension_id_copy);
 }
 
 void AlarmManager::AddAlarmImpl(const std::string& extension_id,
                                 const linked_ptr<Alarm>& alarm,
                                 base::TimeDelta time_delay) {
   // Override any old alarm with the same name.
   AlarmIterator old_alarm = GetAlarmIterator(extension_id, alarm->name);
   if (old_alarm.first != alarms_.end())
     RemoveAlarmIterator(old_alarm);
 
   alarms_[extension_id].push_back(alarm);
   AlarmRuntimeInfo info;
   info.extension_id = extension_id;
   info.time = base::Time::Now() + time_delay;
   scheduled_times_[alarm.get()] = info;
 
   // TODO(yoz): Is 0 really sane? There could be thrashing.
   ScheduleNextPoll(base::TimeDelta::FromMinutes(0));
 }
 
-void AlarmManager::WriteToPrefs(const std::string& extension_id) {
-  ExtensionService* service =
-      ExtensionSystem::Get(profile_)->extension_service();
-  if (!service || !service->extension_prefs())
+void AlarmManager::WriteToStorage(const std::string& extension_id) {
+  StateStore* storage = ExtensionSystem::Get(profile_)->state_store();
+  if (!storage)
     return;
 
-  std::vector<AlarmPref> alarm_prefs;
-
+  std::vector<AlarmState> alarm_states;
   AlarmMap::iterator list = alarms_.find(extension_id);
   if (list != alarms_.end()) {
     for (AlarmList::iterator it = list->second.begin();
          it != list->second.end(); ++it) {
-      AlarmPref pref;
+      AlarmState pref;
       pref.alarm = *it;
       pref.scheduled_run_time = scheduled_times_[it->get()].time;
-      alarm_prefs.push_back(pref);
+      alarm_states.push_back(pref);
     }
   }
 
-  service->extension_prefs()->SetRegisteredAlarms(extension_id, alarm_prefs);
+  scoped_ptr<Value> alarms(AlarmsToValue(alarm_states).release());
+  storage->SetExtensionValue(extension_id, kRegisteredAlarms, alarms.Pass());
 }
 
-void AlarmManager::ReadFromPrefs(const std::string& extension_id) {
-  ExtensionService* service =
-      ExtensionSystem::Get(profile_)->extension_service();
-  if (!service || !service->extension_prefs())
+void AlarmManager::ReadFromStorage(const std::string& extension_id,
+                                   scoped_ptr<base::Value> value) {
+  base::ListValue* list = NULL;
+  if (!value.get() || !value->GetAsList(&list))
     return;
 
-  std::vector<AlarmPref> alarm_prefs =
-      service->extension_prefs()->GetRegisteredAlarms(extension_id);
-  for (size_t i = 0; i < alarm_prefs.size(); ++i) {
+  std::vector<AlarmState> alarm_states = AlarmsFromValue(list);
+  for (size_t i = 0; i < alarm_states.size(); ++i) {
     base::TimeDelta delay =
-        alarm_prefs[i].scheduled_run_time - base::Time::Now();
+        alarm_states[i].scheduled_run_time - base::Time::Now();
     if (delay < base::TimeDelta::FromSeconds(0))
       delay = base::TimeDelta::FromSeconds(0);
 
-    AddAlarmImpl(extension_id, alarm_prefs[i].alarm, delay);
+    AddAlarmImpl(extension_id, alarm_states[i].alarm, delay);
   }
 }
 
 void AlarmManager::ScheduleNextPoll(base::TimeDelta min_period) {
   // 0. If there are no alarms, stop the timer.
   if (scheduled_times_.empty()) {
     timer_.Stop();
     return;
   }
 
@@ skipping 54 matching lines @@
 }
 
 void AlarmManager::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   switch (type) {
     case chrome::NOTIFICATION_EXTENSION_LOADED: {
       const Extension* extension =
           content::Details<const Extension>(details).ptr();
-      ReadFromPrefs(extension->id());
+      StateStore* storage = ExtensionSystem::Get(profile_)->state_store();
+      if (storage) {
+        storage->GetExtensionValue(extension->id(), kRegisteredAlarms,
+            base::Bind(&AlarmManager::ReadFromStorage,
+                       AsWeakPtr(), extension->id()));
+      }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 }
 
-AlarmPref::AlarmPref() {
-}
-
-AlarmPref::~AlarmPref() {
-}
-
 }  // namespace extensions