NOT FOR REVIEW: Aura on Android

content/browser/frame_host/render_widget_host_view_guest.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 "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
@@ skipping 498 matching lines @@
 
 #endif  // defined(OS_MACOSX)
 
 #if defined(OS_ANDROID) || defined(USE_AURA)
 void RenderWidgetHostViewGuest::ShowDisambiguationPopup(
     const gfx::Rect& rect_pixels,
     const SkBitmap& zoomed_bitmap) {
 }
 #endif  // defined(OS_ANDROID) || defined(USE_AURA)
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 void RenderWidgetHostViewGuest::LockCompositingSurface() {
 }
 
 void RenderWidgetHostViewGuest::UnlockCompositingSurface() {
 }
 #endif  // defined(OS_ANDROID)
 
 #if defined(OS_WIN)
 void RenderWidgetHostViewGuest::SetParentNativeViewAccessible(
     gfx::NativeViewAccessible accessible_parent) {
@@ skipping 127 matching lines @@
   }
 
   if (blink::WebInputEvent::isGestureEventType(event->type)) {
     host_->ForwardGestureEvent(
         *static_cast<const blink::WebGestureEvent*>(event));
     return;
   }
 }
 
 }  // namespace content