Revert r276792 - "Hook PushMessagingMessageFilter up to GCMDriver"

content/browser/push_messaging_message_filter.cc

Index: content/browser/push_messaging_message_filter.cc
diff --git a/content/browser/push_messaging_message_filter.cc b/content/browser/push_messaging_message_filter.cc
index 43a814746ddb29ca8ced4bd99445d6ebd8d0ed7e..e0787a7c9fd91a63bcb703df33ee867361533350 100644
--- a/content/browser/push_messaging_message_filter.cc
+++ b/content/browser/push_messaging_message_filter.cc
@@ -6,20 +6,13 @@
 
 #include <string>
 
-#include "base/bind.h"
-#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/push_messaging_messages.h"
-#include "content/public/browser/browser_context.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/push_messaging_service.h"
 
 namespace content {
 
-PushMessagingMessageFilter::PushMessagingMessageFilter(int render_process_id)
-    : BrowserMessageFilter(PushMessagingMsgStart),
-      render_process_id_(render_process_id),
-      service_(NULL),
-      weak_factory_(this) {}
+PushMessagingMessageFilter::PushMessagingMessageFilter()
+    : BrowserMessageFilter(PushMessagingMsgStart) {}
 
 PushMessagingMessageFilter::~PushMessagingMessageFilter() {}
 
@@ -36,33 +29,19 @@ bool PushMessagingMessageFilter::OnMessageReceived(
 void PushMessagingMessageFilter::OnRegister(int routing_id,
                                             int callbacks_id,
                                             const std::string& sender_id) {
+  // TODO(mvanouwerkerk): Really implement, the below simply returns an error.
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  // TODO(mvanouwerkerk): Validate arguments?
-  // TODO(mvanouwerkerk): A WebContentsObserver could avoid this PostTask
-  //                      by receiving the IPC on the UI thread.
+  GURL endpoint = GURL("https://android.googleapis.com/gcm/send");
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
-                          base::Bind(&PushMessagingMessageFilter::DoRegister,
-                                     weak_factory_.GetWeakPtr(),
+                          base::Bind(&PushMessagingMessageFilter::DidRegister,
+                                     this,
                                      routing_id,
                                      callbacks_id,
-                                     sender_id));
-}
+                                     endpoint,
+                                     "",
+                                     true));
 
-void PushMessagingMessageFilter::DoRegister(int routing_id,
-                                            int callbacks_id,
-                                            const std::string& sender_id) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  if (!service())
-    return;
-  // TODO(mvanouwerkerk): Pass in app ID based on Service Worker ID.
-  std::string app_id = "unknown-app-id";
-  service_->Register(app_id,
-                     sender_id,
-                     base::Bind(&PushMessagingMessageFilter::DidRegister,
-                                weak_factory_.GetWeakPtr(),
-                                routing_id,
-                                callbacks_id));
 }
 
 void PushMessagingMessageFilter::DidRegister(int routing_id,
@@ -81,15 +60,4 @@ void PushMessagingMessageFilter::DidRegister(int routing_id,
   }
 }
 
-PushMessagingService* PushMessagingMessageFilter::service() {
-  if (!service_) {
-    RenderProcessHostImpl* host = static_cast<RenderProcessHostImpl*>(
-        RenderProcessHost::FromID(render_process_id_));
-    if (!host)
-      return NULL;
-    service_ = host->GetBrowserContext()->GetPushMessagingService();
-  }
-  return service_;
-}
-
 }  // namespace content