Use Android callback API to obtain cellular signal strength

net/android/cellular_signal_strength.cc

Index: net/android/cellular_signal_strength.cc
diff --git a/net/android/cellular_signal_strength.cc b/net/android/cellular_signal_strength.cc
index 4c236954f7adab841bb53a4b363464eb5ab68c16..031c8f7340c6d769dea46524bcc9b6836f4f6b43 100644
--- a/net/android/cellular_signal_strength.cc
+++ b/net/android/cellular_signal_strength.cc
@@ -11,7 +11,7 @@ namespace net {
 
 namespace android {
 
-namespace cellular_signal_strength {
+namespace {
 
 // GENERATED_JAVA_ENUM_PACKAGE: org.chromium.net
 enum CellularSignalStrengthError {
@@ -26,23 +26,25 @@ static_assert(
     INT32_MIN == ERROR_NOT_SUPPORTED,
     "CellularSignalStrengthError.ERROR_NOT_SUPPORTED has unexpected value");
 
-bool GetSignalStrengthDbm(int32_t* signal_strength_dbm) {
-  int32_t signal_strength_dbm_tmp =
-      Java_AndroidCellularSignalStrength_getSignalStrengthDbm(
-          base::android::AttachCurrentThread(),
-          base::android::GetApplicationContext());
-  if (signal_strength_dbm_tmp == ERROR_NOT_SUPPORTED)
-    return false;
+}  // namespace
 
-  *signal_strength_dbm = signal_strength_dbm_tmp;
-  return true;
+CellularSignalStrength::CellularSignalStrength() {
+  j_cellular_signal_strength_.Reset(Java_AndroidCellularSignalStrength_create(
+      base::android::AttachCurrentThread(),
+      base::android::GetApplicationContext()));
+}
+
+CellularSignalStrength::~CellularSignalStrength() {
+  DCHECK(thread_checker_.CalledOnValidThread());
 }
 
-bool GetSignalStrengthLevel(int32_t* signal_strength_level) {
+bool CellularSignalStrength::GetSignalStrengthLevel(
+    int32_t* signal_strength_level) const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+
   int32_t signal_strength_level_tmp =
       Java_AndroidCellularSignalStrength_getSignalStrengthLevel(
-          base::android::AttachCurrentThread(),
-          base::android::GetApplicationContext());
+          base::android::AttachCurrentThread(), j_cellular_signal_strength_);
   if (signal_strength_level_tmp == ERROR_NOT_SUPPORTED)
     return false;
 
@@ -50,8 +52,6 @@ bool GetSignalStrengthLevel(int32_t* signal_strength_level) {
   return true;
 }
 
-}  // namespace cellular_signal_strength
-
 }  // namespace android
 
 }  // namespace net