Make ChildThread::current() and ChildProcess::current() only work on the main thread of the child...

content/child/child_thread.h

Index: content/child/child_thread.h
===================================================================
--- content/child/child_thread.h	(revision 208577)
+++ content/child/child_thread.h	(working copy)
@@ -93,9 +93,6 @@
     return quota_dispatcher_.get();
   }
 
-  // Safe to call on any thread, as long as it's guaranteed that the thread's
-  // lifetime is less than the main thread. The |filter| returned may only
-  // be used on background threads.
   IPC::SyncMessageFilter* sync_message_filter() const {
     return sync_message_filter_.get();
   }
@@ -113,10 +110,14 @@
 
   base::MessageLoop* message_loop() const { return message_loop_; }
 
-  // Returns the one child thread.
+  // Returns the one child thread. Can only be called on the main thread.

[scottmg, 2013/06/26 15:21:50]

would be nice to have some way to assert that comment.

[jam, 2013/06/26 17:23:08]

the fact that we use TLS for this ensures that now

   static ChildThread* current();
 
-  virtual bool IsWebFrameValid(WebKit::WebFrame* frame);
+#if defined(OS_ANDROID)
+  // Called on Android's service thread to shutdown the main thread of this
+  // process.
+  static void ShutdownThread();
+#endif
 
  protected:
   friend class ChildProcess;