Upstrem prefs changes

chrome/browser/prefs/incognito_mode_prefs.cc

Index: chrome/browser/prefs/incognito_mode_prefs.cc
diff --git a/chrome/browser/prefs/incognito_mode_prefs.cc b/chrome/browser/prefs/incognito_mode_prefs.cc
index e3d7499e7052e80ee94e519dae39bae31ad3a2fc..19ebf22c034634f62a21843b489c3487e11e0e1c 100644
--- a/chrome/browser/prefs/incognito_mode_prefs.cc
+++ b/chrome/browser/prefs/incognito_mode_prefs.cc
@@ -209,7 +209,14 @@ bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
 #if defined(OS_WIN)
   return PlatformParentalControlsValue::GetInstance()->is_enabled();
 #elif defined(OS_ANDROID)
+#if defined(USE_AURA)
+  // TODO(bshe): Support parental controls for Aura Android. See
+  // crbug.com/564742
+  NOTIMPLEMENTED();
+  return false;
+#else
   return chrome::android::ChromeApplication::AreParentalControlsEnabled();
+#endif
 #else
   return false;
 #endif