Plumb invalidations from Tango to the extensions code for the Push Messaging API.

chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc

Index: chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
diff --git a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
index c78f77a75f32ed901370b9a70b1916239277d7bb..20c523b6883355207246aba27946034244706bbc 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
@@ -3,22 +3,47 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/push_messaging/push_messaging_api.h"
+#include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_handler.h"
+#include "chrome/browser/extensions/api/push_messaging/push_messaging_invalidation_mapper.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
+#include "testing/gmock/include/gmock/gmock.h"
+
+using ::testing::_;
+using ::testing::SaveArg;
+using ::testing::StrictMock;
 
 namespace extensions {
 
+class MockInvalidationMapper : public PushMessagingInvalidationMapper {
+ public:
+  MockInvalidationMapper();
+  ~MockInvalidationMapper();
+
+  MOCK_METHOD1(RegisterExtension, void(const std::string&));
+  MOCK_METHOD1(UnregisterExtension, void(const std::string&));
+};
+
+MockInvalidationMapper::MockInvalidationMapper() {}
+MockInvalidationMapper::~MockInvalidationMapper() {}
+
 class PushMessagingApiTest : public ExtensionApiTest {
  public:
   virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
   }
+
+  PushMessagingEventRouter* GetEventRouter() {
+    return ExtensionSystem::Get(browser()->profile())->extension_service()->
+        push_messaging_event_router();
+  }
 };
 
 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {
@@ -33,12 +58,48 @@ IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {
   ui_test_utils::NavigateToURL(browser(), page_url);
   EXPECT_TRUE(ready.WaitUntilSatisfied());
 
-  // Trigger a callback.
-  browser()->profile()->GetExtensionService()->
-      push_messaging_event_router()->OnMessage(
-          extension->id(), 1, "payload");
+  GetEventRouter()->TriggerMessageForTest(extension->id(), 1, "payload");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
 
+// Checks that an extension with the pushMessaging permission gets automatically
+// registered for invalidations when it is loaded.
+IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, AutoRegistration) {
+  scoped_ptr<StrictMock<MockInvalidationMapper> > mapper(
+      new StrictMock<MockInvalidationMapper>);
+  StrictMock<MockInvalidationMapper>* unsafe_mapper = mapper.get();
+  // PushMessagingEventRouter owns the mapper now.
+  GetEventRouter()->SetMapperForTest(
+          mapper.PassAs<PushMessagingInvalidationMapper>());
+
+  std::string extension_id;
+  EXPECT_CALL(*unsafe_mapper, RegisterExtension(_))
+      .WillOnce(SaveArg<0>(&extension_id));
+  const extensions::Extension* extension =
+      LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
+  ASSERT_TRUE(extension);
+  EXPECT_EQ(extension->id(), extension_id);
+  EXPECT_CALL(*unsafe_mapper, UnregisterExtension(extension->id()));
+  UnloadExtension(extension->id());
+}
+
+// Tests that we re-register for invalidations on restart for extensions that
+// are already installed.
+IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, PRE_Restart) {
+  PushMessagingInvalidationHandler* handler =
+      static_cast<PushMessagingInvalidationHandler*>(
+          GetEventRouter()->GetMapperForTest());
+  EXPECT_TRUE(handler->GetRegisteredExtensionsForTest().empty());
+  ASSERT_TRUE(InstallExtension(test_data_dir_.AppendASCII("push_messaging"),
+                               1 /* new install */));
+}
+
+IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, Restart) {
+  PushMessagingInvalidationHandler* handler =
+      static_cast<PushMessagingInvalidationHandler*>(
+          GetEventRouter()->GetMapperForTest());
+  EXPECT_EQ(1U, handler->GetRegisteredExtensionsForTest().size());
+}
+
 }  // namespace extensions