Move remaining @CalledByNative methods out of ChromeApplication.

chrome/browser/prefs/incognito_mode_prefs.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 
 #include <stdint.h>
 
 #include "base/command_line.h"
 #include "base/logging.h"
@@ skipping 14 matching lines @@
 #include <windows.h>
 #include <wpcapi.h>
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/singleton.h"
 #include "base/win/scoped_comptr.h"
 #include "base/win/windows_version.h"
 #endif  // OS_WIN
 
 #if defined(OS_ANDROID)
-#include "chrome/browser/android/chrome_application.h"
+#include "base/android/jni_android.h"
+#include "jni/PartnerBrowserCustomizations_jni.h"

[Bernhard Bauer, 2017/03/27 10:09:40]

Including JNI headers in arbitrary .cc files is a bit tricky, because they can
also include glue methods, so you might end up violating the ODR if you include
the same header in multiple files. It would be nicer to make a dedicated pair of
partner_browser_customizations.{h,cc} files where only the .cc file includes the
JNI header, and use that from here.

[estevenson, 2017/03/27 20:03:53]

Done.

 #endif  // defined(OS_ANDROID)
 
 using content::BrowserThread;
 
 #if defined(OS_WIN)
 namespace {
 
 // This singleton allows us to attempt to calculate the Platform Parental
 // Controls enabled value on a worker thread before the UI thread needs the
 // value. If the UI thread finishes sooner than we expect, that's no worse than
@@ skipping 160 matching lines @@
       base::Bind(
           base::IgnoreResult(&PlatformParentalControlsValue::GetInstance)));
 }
 #endif
 
 // static
 bool IncognitoModePrefs::ArePlatformParentalControlsEnabled() {
 #if defined(OS_WIN)
   return PlatformParentalControlsValue::GetInstance()->is_enabled();
 #elif defined(OS_ANDROID)
-  return chrome::android::ChromeApplication::AreParentalControlsEnabled();
+  return Java_PartnerBrowserCustomizations_areParentalControlsEnabled(
+      base::android::AttachCurrentThread());
 #else
   return false;
 #endif
 }
 
 // static
 IncognitoModePrefs::Availability IncognitoModePrefs::GetAvailabilityInternal(
     const PrefService* pref_service,
     GetAvailabilityMode mode) {
   DCHECK(pref_service);
   int pref_value = pref_service->GetInteger(prefs::kIncognitoModeAvailability);
   Availability result = IncognitoModePrefs::ENABLED;
   bool valid = IntToAvailability(pref_value, &result);
   DCHECK(valid);
   if (result != IncognitoModePrefs::DISABLED &&
       mode == CHECK_PARENTAL_CONTROLS && ArePlatformParentalControlsEnabled()) {
     if (result == IncognitoModePrefs::FORCED)
       LOG(ERROR) << "Ignoring FORCED incognito. Parental control logging on";
     return IncognitoModePrefs::DISABLED;
   }
   return result;
 }