Use DCHECK_CURRENTLY_ON in content/

content/browser/android/child_process_launcher_android.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/android/child_process_launcher_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 162 matching lines @@
                           const JavaParamRef<jclass>& clazz,
                           jint pid,
                           const JavaParamRef<jobject>& surface,
                           jint primary_id,
                           jint secondary_id) {
   ScopedJavaGlobalRef<jobject> jsurface;
   jsurface.Reset(env, surface);
   if (jsurface.is_null())
     return;
 
-  DCHECK(!BrowserThread::CurrentlyOn(BrowserThread::UI));

[Lei Zhang, 2015/09/08 22:50:22]

gah, search and replace fail.

[Lei Zhang, 2015/09/08 22:59:43]

This change has been reverted.

+  DCHECK_CURRENTLY_ON(BrowserThread::UI);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE, base::Bind(
       &SetSurfacePeer, jsurface, pid, primary_id, secondary_id));
 }
 
 void RegisterViewSurface(int surface_id, jobject j_surface) {
   JNIEnv* env = AttachCurrentThread();
   DCHECK(env);
   Java_ChildProcessLauncher_registerViewSurface(env, surface_id, j_surface);
 }
 
@@ skipping 34 matching lines @@
 jboolean IsSingleProcess(JNIEnv* env, const JavaParamRef<jclass>& clazz) {
   return base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kSingleProcess);
 }
 
 bool RegisterChildProcessLauncher(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace content