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

content/child/child_thread.h

 // 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.
 
 #ifndef CONTENT_CHILD_CHILD_THREAD_H_
 #define CONTENT_CHILD_CHILD_THREAD_H_
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
@@ skipping 75 matching lines @@
   }
 
   FileSystemDispatcher* file_system_dispatcher() const {
     return file_system_dispatcher_.get();
   }
 
   QuotaDispatcher* quota_dispatcher() const {
     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();
   }
 
   // The getter should only be called on the main thread, however the
   // IPC::Sender it returns may be safely called on any thread including
   // the main thread.
   ThreadSafeSender* thread_safe_sender() const {
     return thread_safe_sender_.get();
   }
 
   ChildHistogramMessageFilter* child_histogram_message_filter() const {
     return histogram_message_filter_.get();
   }
 
   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;
 
   // Called when the process refcount is 0.
   void OnProcessFinalRelease();
 
   virtual bool OnControlMessageReceived(const IPC::Message& msg);
 
   void set_on_channel_error_called(bool on_channel_error_called) {
@@ skipping 54 matching lines @@
   scoped_refptr<ChildResourceMessageFilter> resource_message_filter_;
 
   base::WeakPtrFactory<ChildThread> channel_connected_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(ChildThread);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_CHILD_CHILD_THREAD_H_