Chrome Alarm Clear and ClearAll Updates

chrome/browser/extensions/api/alarms/alarms_api_unittest.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.
 
 // This file tests the chrome.alarms extension API.
 
 #include "base/test/simple_test_clock.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
 #include "chrome/browser/extensions/api/alarms/alarms_api.h"
@@ skipping 371 matching lines @@
   EXPECT_EQ("", test->alarm_delegate_->alarms_seen[0]);
 
   // Ensure the 0.001-minute alarm is still there, since it's repeating.
   test->alarm_manager_->GetAllAlarms(test->extension()->id(), base::Bind(
       ExtensionAlarmsTestClearGetAllAlarms2Callback));
 }
 
 TEST_F(ExtensionAlarmsTest, Clear) {
   // Clear a non-existent one.
   {
-    std::string error = RunFunctionAndReturnError(
-        new AlarmsClearFunction(), "[\"nobody\"]");
-    EXPECT_FALSE(error.empty());
+    scoped_ptr<base::Value> result(
+        RunFunctionAndReturnValue(new AlarmsClearFunction(), "[\"nobody\"]"));
+    bool copy_bool_result = false;
+    ASSERT_TRUE(result->GetAsBoolean(&copy_bool_result));
+    EXPECT_FALSE(copy_bool_result);
   }
 
   // Create 3 alarms.
   CreateAlarms(3);
 
   // Clear all but the 0.001-minute alarm.
-  RunFunction(new AlarmsClearFunction(), "[\"7\"]");
-  RunFunction(new AlarmsClearFunction(), "[\"0\"]");
+  {
+    scoped_ptr<base::Value> result(
+        RunFunctionAndReturnValue(new AlarmsClearFunction(), "[\"7\"]"));
+    bool copy_bool_result = false;
+    ASSERT_TRUE(result->GetAsBoolean(&copy_bool_result));
+    EXPECT_TRUE(copy_bool_result);
+  }
+  {
+    scoped_ptr<base::Value> result(
+        RunFunctionAndReturnValue(new AlarmsClearFunction(), "[\"0\"]"));
+    bool copy_bool_result = false;
+    ASSERT_TRUE(result->GetAsBoolean(&copy_bool_result));
+    EXPECT_TRUE(copy_bool_result);
+  }
 
   alarm_manager_->GetAllAlarms(extension()->id(), base::Bind(
       ExtensionAlarmsTestClearGetAllAlarms1Callback, this));
 }
 
 void ExtensionAlarmsTestClearAllGetAllAlarms2Callback(
     const AlarmManager::AlarmList* alarms) {
   ASSERT_FALSE(alarms);
 }
 
 void ExtensionAlarmsTestClearAllGetAllAlarms1Callback(
     ExtensionAlarmsTest* test, const AlarmManager::AlarmList* alarms) {
   ASSERT_TRUE(alarms);
   EXPECT_EQ(3u, alarms->size());
 
   // Clear them.
   test->RunFunction(new AlarmsClearAllFunction(), "[]");
   test->alarm_manager_->GetAllAlarms(
       test->extension()->id(), base::Bind(
           ExtensionAlarmsTestClearAllGetAllAlarms2Callback));
 }
 
 TEST_F(ExtensionAlarmsTest, ClearAll) {
   // ClearAll with no alarms set.
   {
     scoped_ptr<base::Value> result(RunFunctionAndReturnValue(
         new AlarmsClearAllFunction(), "[]"));
-    EXPECT_FALSE(result.get());
+    bool copy_bool_result = false;
+    ASSERT_TRUE(result->GetAsBoolean(&copy_bool_result));
+    EXPECT_TRUE(copy_bool_result);
   }
 
   // Create 3 alarms.
   CreateAlarms(3);
   alarm_manager_->GetAllAlarms(extension()->id(), base::Bind(
       ExtensionAlarmsTestClearAllGetAllAlarms1Callback, this));
 }
 
 class ExtensionAlarmsSchedulingTest : public ExtensionAlarmsTest {
   void GetAlarmCallback(Alarm* alarm) {
@@ skipping 200 matching lines @@
 
   // The next poll should be the first poll that hasn't happened and is in-line
   // with the original scheduling.
   // Last poll was at 380 seconds; next poll should be at 480 seconds.
   EXPECT_DOUBLE_EQ((alarm_manager_->last_poll_time_ +
                        base::TimeDelta::FromSeconds(100)).ToJsTime(),
                    alarm_manager_->next_poll_time_.ToJsTime());
 }
 
 }  // namespace extensions