[NOT FOR REVIEW] Plumb Android GCM to Push API

chrome/browser/chrome_content_browser_client.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/chrome_content_browser_client.h"
 
 #include <set>
 #include <utility>
 #include <vector>
 
@@ skipping 89 matching lines @@
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "chromeos/chromeos_constants.h"
 #include "components/nacl/browser/nacl_browser.h"
 #include "components/nacl/browser/nacl_host_message_filter.h"
 #include "components/nacl/browser/nacl_process_host.h"
 #include "components/nacl/common/nacl_process_type.h"
 #include "components/nacl/common/nacl_switches.h"
 #include "components/translate/core/common/translate_switches.h"
 #include "components/user_prefs/pref_registry_syncable.h"
+#include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_child_process_host.h"
 #include "content/public/browser/browser_main_parts.h"
 #include "content/public/browser/browser_ppapi_host.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/browser_url_handler.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 47 matching lines @@
 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 #include "chrome/browser/chromeos/drive/fileapi/file_system_backend_delegate.h"
 #include "chrome/browser/chromeos/fileapi/file_system_backend.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/system/input_device_settings.h"
 #include "chromeos/chromeos_switches.h"
 #elif defined(OS_LINUX)
 #include "chrome/browser/chrome_browser_main_linux.h"
 #elif defined(OS_ANDROID)
+#include "chrome/browser/android/gcm_android.h"
 #include "chrome/browser/android/new_tab_page_url_handler.h"
 #include "chrome/browser/android/webapps/single_tab_mode_tab_helper.h"
 #include "chrome/browser/chrome_browser_main_android.h"
 #include "chrome/browser/media/encrypted_media_message_filter_android.h"
 #include "chrome/common/descriptors_android.h"
 #include "components/breakpad/browser/crash_dump_manager_android.h"
 #elif defined(OS_POSIX)
 #include "chrome/browser/chrome_browser_main_posix.h"
 #endif
 
@@ skipping 2028 matching lines @@
     ChromeContentBrowserClient::GetSpeechRecognitionManagerDelegate() {
 #if defined(ENABLE_INPUT_SPEECH)
   return new speech::ChromeSpeechRecognitionManagerDelegateBubbleUI();
 #else
   // Platforms who don't implement x-webkit-speech (a.k.a INPUT_SPEECH) just
   // need the base delegate without the bubble UI.
   return new speech::ChromeSpeechRecognitionManagerDelegate();
 #endif
 }
 
+// FIXME: When this returns an instance of GcmPlatformImplAndroid, this DOES NOT
+// transfer ownership, but when it returns an instance of
+// PushMessagingServiceImpl, it DOES transfer ownership. Aggh!
 content::PushMessagingService*
 ChromeContentBrowserClient::CreatePushMessagingService(
-    content::BrowserContext* browser_context) {
+    content::RenderProcessHostImpl* rphi) {
+#if defined(OS_ANDROID)
+  GcmPlatformImplAndroid* gcm = GcmPlatformImplAndroid::GetInstance();
+  gcm->SetObserver(rphi->push_messaging_message_filter());
+  return gcm;
+#else
   return new PushMessagingServiceImpl(
-      Profile::FromBrowserContext(browser_context));
+      Profile::FromBrowserContext(rphi->->GetBrowserContext()));
+#endif
 }
 
 net::NetLog* ChromeContentBrowserClient::GetNetLog() {
   return g_browser_process->net_log();
 }
 
 AccessTokenStore* ChromeContentBrowserClient::CreateAccessTokenStore() {
   return new ChromeAccessTokenStore();
 }
 
@@ skipping 527 matching lines @@
       switches::kDisableWebRtcEncryption,
     };
     to_command_line->CopySwitchesFrom(from_command_line,
                                       kWebRtcDevSwitchNames,
                                       arraysize(kWebRtcDevSwitchNames));
   }
 }
 #endif  // defined(ENABLE_WEBRTC)
 
 }  // namespace chrome