NOT FOR REVIEW: Aura on Android

chrome/browser/ui/android/toolbar/toolbar_model_android.cc

Index: chrome/browser/ui/android/toolbar/toolbar_model_android.cc
diff --git a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc
index 2ce0ed4cd0f0c7d538885c55fec6fd92ab098e38..a0a963a4b50b68fbb0b81eb83afc272492d73a3c 100644
--- a/chrome/browser/ui/android/toolbar/toolbar_model_android.cc
+++ b/chrome/browser/ui/android/toolbar/toolbar_model_android.cc
@@ -50,6 +50,7 @@ jboolean ToolbarModelAndroid::WouldReplaceURL(JNIEnv* env, jobject obj) {
 }
 
 content::WebContents* ToolbarModelAndroid::GetActiveWebContents() const {
+#if !defined(USE_AURA)
   JNIEnv* env = base::android::AttachCurrentThread();
   ScopedJavaLocalRef<jobject> jdelegate = weak_java_delegate_.get(env);
   if (!jdelegate.obj())
@@ -57,6 +58,9 @@ content::WebContents* ToolbarModelAndroid::GetActiveWebContents() const {
   ScopedJavaLocalRef<jobject> jweb_contents =
       Java_ToolbarModelDelegate_getActiveWebContents(env, jdelegate.obj());
   return content::WebContents::FromJavaWebContents(jweb_contents.obj());
+#else
+  return NULL;
+#endif
 }
 
 // static
@@ -81,6 +85,7 @@ jlong Init(JNIEnv* env, jobject obj, jobject delegate) {
 jboolean IsDeprecatedSHA1Present(JNIEnv* env,
                                  jclass jcaller,
                                  jobject jweb_contents) {
+#if !defined(USE_AURA)
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(jweb_contents);
   DCHECK(web_contents);
@@ -103,4 +108,7 @@ jboolean IsDeprecatedSHA1Present(JNIEnv* env,
     }
   }
   return false;
+#else
+  return false;
+#endif
 }