base: Change DCHECK_IS_ON to a macro DCHECK_IS_ON().

chromecast/browser/android/external_video_surface_container_impl.cc

 // Copyright 2014 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 "chromecast/browser/android/external_video_surface_container_impl.h"
 
 #include "base/android/jni_android.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/ExternalVideoSurfaceContainer_jni.h"
 #include "ui/gfx/geometry/rect_f.h"
@@ skipping 25 matching lines @@
     const SurfaceDestroyedCB& surface_destroyed_cb) {
   surface_created_cb_ = surface_created_cb;
   surface_destroyed_cb_ = surface_destroyed_cb;
 
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_ExternalVideoSurfaceContainer_requestExternalVideoSurface(
       env, jobject_.obj(), static_cast<jint>(player_id));
 }
 
 int ExternalVideoSurfaceContainerImpl::GetCurrentPlayerId() {
-  JNIEnv* env = AttachCurrentThread();
+  JNIEnv* env = base::android::AttachCurrentThread();

[Nico, 2015/01/07 00:12:13]

looks somewhat unrelated, but ok :-)

[danakj, 2015/01/07 04:40:17]

Er. I dunno how that is there. I'll remove it before landing. Musta picked it up
during rebase somehow. 

 
   int current_player = static_cast<int>(
       Java_ExternalVideoSurfaceContainer_getCurrentPlayerId(
           env, jobject_.obj()));
 
   if (current_player < 0)
     return kInvalidPlayerId;
   else
     return current_player;
 }
@@ skipping 38 matching lines @@
   if (!surface_destroyed_cb_.is_null())
     surface_destroyed_cb_.Run(static_cast<int>(player_id));
 }
 
 bool RegisterExternalVideoSurfaceContainer(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace shell
 }  // namespace chromecast