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

chrome/browser/extensions/api/push_messaging/push_messaging_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/push_messaging/push_messaging_api.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);
   }
 };
 

[Pete Williamson, 2012/08/13 18:24:09]

Should we also have a unit test for the "Init()" method?

[dcheng, 2012/08/13 20:44:14]

This wasn't originally possible since it would require a test that could span
restarts... but jam has added some infrastructure that might make it possible.
I'll have to investigate.

 IN_PROC_BROWSER_TEST_F(PushMessagingApiTest, EventDispatch) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   ExtensionTestMessageListener ready("ready", true);
   const extensions::Extension* extension =
       LoadExtension(test_data_dir_.AppendASCII("push_messaging"));
   ASSERT_TRUE(extension);
   GURL page_url = extension->GetResourceURL("event_dispatch.html");
   ui_test_utils::NavigateToURL(browser(), page_url);
   EXPECT_TRUE(ready.WaitUntilSatisfied());
 
   // Trigger a callback.
-  browser()->profile()->GetExtensionService()->
+  ExtensionSystem::Get(browser()->profile())->extension_service()->
       push_messaging_event_router()->OnMessage(
           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.
+  ExtensionSystem::Get(browser()->profile())->extension_service()->
+      push_messaging_event_router()->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());
+}
+
 }  // namespace extensions