Update notifications API after review.

chrome/browser/extensions/api/notification/notification_apitest.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/notification/notification_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/common/chrome_switches.h"
 
 using extensions::Extension;
@@ skipping 22 matching lines @@
         notification_function(
             new extensions::NotificationCreateFunction());
 
     notification_function->set_extension(empty_extension.get());
     notification_function->set_has_callback(true);
 
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
         notification_function,
         "[\"\", "  // Empty string: ask API to generate ID
         "{"
-        "\"type\": \"simple\","
+        "\"templateType\": \"simple\","
         "\"iconUrl\": \"http://www.google.com/intl/en/chrome/assets/"
         "common/images/chrome_logo_2x.png\","
         "\"title\": \"Attention!\","
         "\"message\": \"Check out Cirque du Soleil\""
         "}]",
         browser(), utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
     ASSERT_TRUE(result->GetAsString(&notification_id));
     ASSERT_TRUE(notification_id.length() > 0);
   }
 
   // Update the existing notification.
   {
     scoped_refptr<extensions::NotificationUpdateFunction>
         notification_function(
             new extensions::NotificationUpdateFunction());
 
     notification_function->set_extension(empty_extension.get());
     notification_function->set_has_callback(true);
 
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
         notification_function,
         "[\"" + notification_id + "\", "
         "{"
-        "\"type\": \"simple\","
+        "\"templateType\": \"simple\","
         "\"iconUrl\": \"http://www.google.com/intl/en/chrome/assets/"
         "common/images/chrome_logo_2x.png\","
         "\"title\": \"Attention!\","
         "\"message\": \"Too late! The show ended yesterday\""
         "}]",
         browser(), utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
     bool copy_bool_value = false;
     ASSERT_TRUE(result->GetAsBoolean(&copy_bool_value));
@@ skipping 12 matching lines @@
         notification_function(
             new extensions::NotificationUpdateFunction());
 
     notification_function->set_extension(empty_extension.get());
     notification_function->set_has_callback(true);
 
     scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
         notification_function,
         "[\"xxxxxxxxxxxx\", "
         "{"
-        "\"type\": \"simple\","
+        "\"templateType\": \"simple\","
         "\"iconUrl\": \"http://www.google.com/intl/en/chrome/assets/"
         "common/images/chrome_logo_2x.png\","
         "\"title\": \"!\","
         "\"message\": \"!\""
         "}]",
         browser(), utils::NONE));
 
     ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
     bool copy_bool_value = false;
     ASSERT_TRUE(result->GetAsBoolean(&copy_bool_value));
@@ skipping 45 matching lines @@
           new extensions::NotificationCreateFunction());
   scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
 
   notification_create_function->set_extension(empty_extension.get());
   notification_create_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
       notification_create_function,
       "[\"\", "
       "{"
-      "\"type\": \"base\","
+      "\"templateType\": \"basic\","
       "\"iconUrl\": \"http://www.google.com/intl/en/chrome/assets/"
       "common/images/chrome_logo_2x.png\","
       "\"title\": \"Attention!\","
       "\"message\": \"Check out Cirque du Soleil\","
       "\"priority\": 1,"
-      "\"timestamp\": \"Tue, 15 Nov 1994 12:45:26 GMT\","
-      "\"secondIconUrl\": \"http://www.google.com/logos/2012/"
-      "Day-Of-The-Dead-12-hp.jpg\","
-      "\"unreadCount\": 42,"
-      "\"buttonOneTitle\": \"Up\","
-      "\"buttonTwoTitle\": \"Down\","
+      "\"eventTime\": \"Tue, 15 Nov 1994 12:45:26 GMT\","
+      "\"buttons\": ["
+      "  {"
+      "   \"title\": \"Up\","
+      "   \"iconUrl\":\"http://www.google.com/logos/2012/\""
+      "  },"
+      "  {"
+      "   \"title\": \"Down\""  // note: no iconUrl
+      "  }"
+      "],"
       "\"expandedMessage\": \"This is a longer expanded message.\","
       "\"imageUrl\": \"http://www.google.com/logos/2012/election12-hp.jpg\""
       "}]",
       browser(), utils::NONE));
 
   std::string notification_id;
   ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
   ASSERT_TRUE(result->GetAsString(&notification_id));
   ASSERT_TRUE(notification_id.length() > 0);
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationApiTest, TestMultipleItemNotification) {
   scoped_refptr<extensions::NotificationCreateFunction>
       notification_create_function(
           new extensions::NotificationCreateFunction());
   scoped_refptr<Extension> empty_extension(utils::CreateEmptyExtension());
 
   notification_create_function->set_extension(empty_extension.get());
   notification_create_function->set_has_callback(true);
 
   scoped_ptr<base::Value> result(utils::RunFunctionAndReturnSingleResult(
       notification_create_function,
       "[\"\", "
       "{"
-      "\"type\": \"multiple\","
+      "\"templateType\": \"list\","
       "\"iconUrl\": \"https://code.google.com/p/chromium/logo\","
       "\"title\": \"Multiple Item Notification Title\","
       "\"message\": \"Multiple item notification message.\","
       "\"items\": ["
       "  {\"title\": \"Brett Boe\","
       " \"message\": \"This is an important message!\"},"
       "  {\"title\": \"Carla Coe\","
       " \"message\": \"Just took a look at the proposal\"},"
       "  {\"title\": \"Donna Doe\","
       " \"message\": \"I see that you went to the conference\"},"
       "  {\"title\": \"Frank Foe\","
       " \"message\": \"I ate Harry's sandwich!\"},"
       "  {\"title\": \"Grace Goe\","
       " \"message\": \"I saw Frank steal a sandwich :-)\"}"
       "],"
       "\"priority\": 1,"
-      "\"timestamp\": \"Fri, 16 Nov 2012 01:17:15 GMT\""
+      "\"eventTime\": \"Fri, 16 Nov 2012 01:17:15 GMT\""
       "}]",
       browser(), utils::NONE));
   // TODO(dharcourt): [...], items = [{title: foo, message: bar}, ...], [...]
 
   std::string notification_id;
   ASSERT_EQ(base::Value::TYPE_STRING, result->GetType());
   ASSERT_TRUE(result->GetAsString(&notification_id));
   ASSERT_TRUE(notification_id.length() > 0);
 }
 
 IN_PROC_BROWSER_TEST_F(NotificationApiTest, TestEvents) {
   ASSERT_TRUE(RunExtensionTest("notification/api/events")) << message_;
 }