NOT FOR REVIEW: Aura on Android - content shell compiles

content/shell/browser/shell.h

Index: content/shell/browser/shell.h
diff --git a/content/shell/browser/shell.h b/content/shell/browser/shell.h
index cf461712b130146f79d93233482713c36671b8ce..a65e3ce548b5edaa47883e764213fa1d7cd1a742 100644
--- a/content/shell/browser/shell.h
+++ b/content/shell/browser/shell.h
@@ -20,7 +20,8 @@
 
 #if defined(OS_ANDROID)
 #include "base/android/scoped_java_ref.h"
-#elif defined(USE_AURA)
+#endif
+#if defined(USE_AURA)
 #if defined(OS_CHROMEOS)
 namespace gfx {
 class Screen;
@@ -117,7 +118,7 @@ class Shell : public WebContentsDelegate,
                       bool* was_blocked) override;
   void LoadingStateChanged(WebContents* source,
                            bool to_different_document) override;
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
   void LoadProgressChanged(WebContents* source, double progress) override;
 #endif
   void EnterFullscreenModeForTab(WebContents* web_contents,
@@ -228,7 +229,8 @@ class Shell : public WebContentsDelegate,
 
 #if defined(OS_ANDROID)
   base::android::ScopedJavaGlobalRef<jobject> java_object_;
-#elif defined(USE_AURA)
+#endif
+#if defined(USE_AURA)
 #if defined(OS_CHROMEOS)
   static wm::WMTestHelper* wm_test_helper_;
   static gfx::Screen* test_screen_;