NOT FOR REVIEW: Aura on Android

content/shell/browser/shell.cc

Index: content/shell/browser/shell.cc
diff --git a/content/shell/browser/shell.cc b/content/shell/browser/shell.cc
index a78bb4ab9a8ddc5b25fd4bea7c5f682782fdbc0c..7a311ec675961c439430573b0b18d549e1dbe1dd 100644
--- a/content/shell/browser/shell.cc
+++ b/content/shell/browser/shell.cc
@@ -295,7 +295,7 @@ void Shell::ExitFullscreenModeForTab(WebContents* web_contents) {
 
 void Shell::ToggleFullscreenModeForTab(WebContents* web_contents,
                                        bool enter_fullscreen) {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   PlatformToggleFullscreenModeForTab(web_contents, enter_fullscreen);
 #endif
   if (!base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ -308,7 +308,7 @@ void Shell::ToggleFullscreenModeForTab(WebContents* web_contents,
 }
 
 bool Shell::IsFullscreenForTabOrPending(const WebContents* web_contents) const {
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   return PlatformIsFullscreenForTabOrPending(web_contents);
 #else
   return is_fullscreen_;