Make Web Push use InstanceID tokens instead of GCM registrations

content/public/test/test_browser_thread_bundle.cc

 // Copyright 2013 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 "content/public/test/test_browser_thread_bundle.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/public/test/test_browser_thread.h"
 
+#if defined(OS_ANDROID)
+#include "content/public/test/nested_message_pump_android.h"
+#endif  // OS_ANDROID
+
 namespace content {
 
 TestBrowserThreadBundle::TestBrowserThreadBundle()
     : TestBrowserThreadBundle(DEFAULT) {}
 
 TestBrowserThreadBundle::TestBrowserThreadBundle(int options)
     : options_(options), threads_started_(false) {
   Init();
 }
 
@@ skipping 28 matching lines @@
   base::RunLoop().RunUntilIdle();
   ui_thread_.reset();
   base::RunLoop().RunUntilIdle();
 }
 
 void TestBrowserThreadBundle::Init() {
   // Check for conflicting options can't have two IO threads.
   CHECK(!(options_ & IO_MAINLOOP) || !(options_ & REAL_IO_THREAD));
   // There must be a thread to start to use DONT_START_THREADS
   CHECK((options_ & ~IO_MAINLOOP) != DONT_START_THREADS);
+  // MessageLoopForIO doesn't currently support custom message pumps.
+  CHECK(!(options_ & IO_MAINLOOP) || !(options_ & NESTED_JAVA_ON_ANDROID));
 
   if (options_ & IO_MAINLOOP) {
     message_loop_.reset(new base::MessageLoopForIO());
-  } else {
+  }
+#if defined(OS_ANDROID)
+  else if (options_ & NESTED_JAVA_ON_ANDROID) {
+    message_loop_.reset(new base::MessageLoopForUI(
+        scoped_ptr<base::MessagePump>(new NestedMessagePumpAndroid())));
+    static_cast<base::MessageLoopForUI*>(message_loop_.get())->Start();
+  }
+#endif  // OS_ANDROID
+  else {
     message_loop_.reset(new base::MessageLoopForUI());
   }
 
   ui_thread_.reset(
       new TestBrowserThread(BrowserThread::UI, message_loop_.get()));
 
   if (options_ & REAL_DB_THREAD) {
     db_thread_.reset(new TestBrowserThread(BrowserThread::DB));
   } else {
     db_thread_.reset(
@@ skipping 61 matching lines @@
   if (options_ & REAL_CACHE_THREAD)
     cache_thread_->Start();
 
   if (options_ & REAL_IO_THREAD)
     io_thread_->StartIOThread();
 
   threads_started_ = true;
 }
 
 }  // namespace content