NOT FOR REVIEW: Aura on Android

chrome/browser/supervised_user/supervised_user_interstitial.cc

Index: chrome/browser/supervised_user/supervised_user_interstitial.cc
diff --git a/chrome/browser/supervised_user/supervised_user_interstitial.cc b/chrome/browser/supervised_user/supervised_user_interstitial.cc
index b8d4653b422edb33bf7ad2aae75fb2303ea94df7..fb7f29ade9e8fdfcdbba1d3a367ae1d0d0f2fbfd 100644
--- a/chrome/browser/supervised_user/supervised_user_interstitial.cc
+++ b/chrome/browser/supervised_user/supervised_user_interstitial.cc
@@ -36,7 +36,7 @@
 #include "ui/base/webui/jstemplate_builder.h"
 #include "ui/base/webui/web_ui_util.h"
 
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
 #include "chrome/browser/supervised_user/child_accounts/child_account_feedback_reporter_android.h"
 #else
 #include "chrome/browser/ui/browser_finder.h"
@@ -76,7 +76,7 @@ class TabCloser : public content::WebContentsUserData<TabCloser> {
 
   void CloseTabImpl() {
     // On Android, FindBrowserWithWebContents and TabStripModel don't exist.
-#if !defined(OS_ANDROID)
+#if !defined(OS_ANDROID) && !defined(USE_AURA)
     Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
     DCHECK(browser);
     TabStripModel* tab_strip = browser->tab_strip_model();
@@ -326,7 +326,7 @@ void SupervisedUserInterstitial::CommandReceived(const std::string& command) {
         SupervisedUserURLFilter::GetBlockMessageID(reason_));
     std::string message = l10n_util::GetStringFUTF8(
         IDS_BLOCK_INTERSTITIAL_DEFAULT_FEEDBACK_TEXT, reason);
-#if defined(OS_ANDROID)
+#if defined(OS_ANDROID) && !defined(USE_AURA)
     ReportChildAccountFeedback(web_contents_, message, url_);
 #else
     chrome::ShowFeedbackPage(chrome::FindBrowserWithWebContents(web_contents_),