NOT FOR REVIEW: Aura on Android

chrome/browser/android/compositor/tab_content_manager.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 "chrome/browser/android/compositor/tab_content_manager.h"
 
 #include <android/bitmap.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 52 matching lines @@
 
     content::ContentViewCore* view =
         content::ContentViewCore::GetNativeContentViewCore(
             env, j_content_view_core_.obj());
 
     if (!view) {
       result_callback.Run(SkBitmap(), content::READBACK_FAILED);
       return;
     }
 
+#if defined(OS_ANDROID) && !defined(USE_AURA)
     DCHECK(view->GetWebContents());
     view->GetWebContents()->GetRenderViewHost()->LockBackingStore();
+#endif
 
     SkColorType color_type = kN32_SkColorType;
 
     // Calling this method with an empty rect will return a bitmap of the size
     // of the content.
     view->GetScaledContentBitmap(thumbnail_scale_, color_type, gfx::Rect(),
                                  result_callback);
   }
 
   void OnFinishGetTabThumbnailBitmap(const SkBitmap& bitmap,
                                      content::ReadbackResponse response) {
     DCHECK(!j_content_view_core_.is_null());
+#if defined(OS_ANDROID) && !defined(USE_AURA)
     JNIEnv* env = base::android::AttachCurrentThread();
     content::ContentViewCore* view =
         content::ContentViewCore::GetNativeContentViewCore(
             env, j_content_view_core_.obj());
 
     if (view) {
       DCHECK(view->GetWebContents());
       view->GetWebContents()->GetRenderViewHost()->UnlockBackingStore();
     }
+#endif
 
     // TODO(jdduke): Tailor response to different failure values appropriately.
     if (response != content::READBACK_SUCCESS || drop_after_readback_) {
       end_callback_.Run(0.f, SkBitmap());
       return;
     }
 
     SkBitmap result_bitmap = bitmap;
     result_bitmap.setImmutable();
     end_callback_.Run(thumbnail_scale_, bitmap);
@@ skipping 272 matching lines @@
            jboolean use_approximation_thumbnail) {
   TabContentManager* manager = new TabContentManager(
       env, obj, default_cache_size, approximation_cache_size,
       compression_queue_max_size, write_queue_max_size,
       use_approximation_thumbnail);
   return reinterpret_cast<intptr_t>(manager);
 }
 
 }  // namespace android
 }  // namespace chrome