Lazy initialization for PushMessagingEventRouter

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 c881e88176b1925b79fa8591fd15ba69476f5f40..02393396a81fa2164685015649bf25ac48099bd1 100644
--- a/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
+++ b/chrome/browser/extensions/api/push_messaging/push_messaging_apitest.cc
@@ -6,8 +6,6 @@
 #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/extensions/platform_app_launcher.h"
 #include "chrome/browser/profiles/profile.h"
@@ -43,9 +41,14 @@ class PushMessagingApiTest : public ExtensionApiTest {
     ExtensionApiTest::SetUpCommandLine(command_line);
   }
 
+  virtual void SetUpOnMainThread() OVERRIDE {
+    PushMessagingAPI::Get(browser()->profile())->
+        InitializePushMessagingEventRouterForTest();
+  }
+
   PushMessagingEventRouter* GetEventRouter() {
-    return ExtensionSystem::Get(browser()->profile())->extension_service()->
-        push_messaging_event_router();
+    return PushMessagingAPI::Get(browser()->profile())->
+        GetPushMessagingEventRouterForTest();
   }
 };