Making a way to create thread with a Java Looper for Android

content/browser/renderer_host/java/java_bridge_dispatcher_host.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 "content/browser/renderer_host/java/java_bridge_dispatcher_host.h"
 
+#ifdef ANDROID
+#include "base/android/java_thread.h"
+#endif

[benm (inactive), 2013/07/10 16:50:06]

I think conditional includes go at the bottom in a separate section.

[Kristian Monsen, 2013/07/10 17:50:19]

You are right, did not know this :-) Makes the logic a bit easier to see.

Done.

 #include "base/bind.h"
 #include "base/lazy_instance.h"
+#ifndef ANDROID
 #include "base/threading/thread.h"
+#endif
 #include "content/browser/renderer_host/java/java_bridge_channel_host.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/child/child_process.h"
 #include "content/child/npobject_stub.h"
 #include "content/child/npobject_util.h"  // For CreateNPVariantParam()
 #include "content/common/java_bridge_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "third_party/WebKit/public/web/WebBindings.h"
 
+#ifdef ANDROID
+#define THREAD base::android::JavaThread
+#else
+#define THREAD base::Thread
+#endif
+
 namespace content {
 
 namespace {
-class JavaBridgeThread : public base::Thread {
+class JavaBridgeThread : public THREAD {
  public:
-  JavaBridgeThread() : base::Thread("JavaBridge") {
+  JavaBridgeThread() : THREAD("JavaBridge") {
     Start();
   }
   virtual ~JavaBridgeThread() {
     Stop();
   }
 };
 
 void CleanUpStubs(const std::vector<base::WeakPtr<NPObjectStub> > & stubs) {
   for (size_t i = 0; i < stubs.size(); ++i) {
     if (stubs[i]) {
@@ skipping 122 matching lines @@
   // functionality. The page URL is also not required.
   stubs_.push_back((new NPObjectStub(
       object, channel_.get(), route_id, 0, GURL()))->AsWeakPtr());
 
   // The NPObjectStub takes a reference to the NPObject. Release the ref added
   // in CreateNPVariantParam().
   WebKit::WebBindings::releaseObject(object);
 }
 
 }  // namespace content