Index: chrome/browser/extensions/api/notification_provider/notification_provider_apitest.cc |
diff --git a/chrome/browser/extensions/api/notification_provider/notification_provider_apitest.cc b/chrome/browser/extensions/api/notification_provider/notification_provider_apitest.cc |
index c7c96b2651f5d60380798e825a40fa2c59bdece7..509ab9b8aae8e6ff1430c031bba84b72f9acded0 100644 |
--- a/chrome/browser/extensions/api/notification_provider/notification_provider_apitest.cc |
+++ b/chrome/browser/extensions/api/notification_provider/notification_provider_apitest.cc |
@@ -4,54 +4,12 @@ |
#include "chrome/browser/extensions/api/notification_provider/notification_provider_api.h" |
-#include "chrome/browser/extensions/chrome_extension_function.h" |
#include "chrome/browser/extensions/extension_apitest.h" |
-#include "chrome/browser/profiles/profile.h" |
-#include "chrome/common/extensions/api/notification_provider.h" |
typedef ExtensionApiTest NotificationProviderApiTest; |
-namespace { |
- |
-void CreateNotificationOptionsForTest( |
- extensions::api::notifications::NotificationOptions* options) { |
- options->type = extensions::api::notifications::ParseTemplateType("basic"); |
- options->icon_url = scoped_ptr<std::string>(new std::string("icon.png")); |
- options->title = scoped_ptr<std::string>(new std::string("Title")); |
- options->message = |
- scoped_ptr<std::string>(new std::string("Here goes the message")); |
- return; |
-} |
- |
-} // namespace |
- |
IN_PROC_BROWSER_TEST_F(NotificationProviderApiTest, Events) { |
- std::string sender_id1 = "SenderId1"; |
- std::string notification_id1 = "NotificationId1"; |
- |
- scoped_ptr<extensions::api::notifications::NotificationOptions> options( |
- new extensions::api::notifications::NotificationOptions()); |
- CreateNotificationOptionsForTest(options.get()); |
- |
- ResultCatcher catcher; |
- catcher.RestrictToProfile(browser()->profile()); |
- |
- // Test notification provider extension |
- const extensions::Extension* extension = |
- LoadExtension(test_data_dir_.AppendASCII("notification_provider/events")); |
- ASSERT_TRUE(extension); |
- |
- scoped_ptr<extensions::NotificationProviderEventRouter> event_router( |
- new extensions::NotificationProviderEventRouter(browser()->profile())); |
- |
- event_router->CreateNotification( |
- extension->id(), sender_id1, notification_id1, *options); |
- event_router->UpdateNotification( |
- extension->id(), sender_id1, notification_id1, *options); |
- event_router->ClearNotification( |
- extension->id(), sender_id1, notification_id1); |
- |
- EXPECT_TRUE(catcher.GetNextResult()) << catcher.message(); |
+ ASSERT_TRUE(RunExtensionTest("notification_provider/events")) << message_; |
} |
IN_PROC_BROWSER_TEST_F(NotificationProviderApiTest, TestBasicUsage) { |