bluetooth: android: register for adapter on/off events followup.

chrome/browser/ui/android/bluetooth_chooser_android.cc

 // Copyright 2015 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/ui/android/bluetooth_chooser_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ssl/chrome_security_state_model_client.h"
@@ skipping 44 matching lines @@
   }
 }
 
 bool BluetoothChooserAndroid::CanAskForScanningPermission() {
   // Creating the dialog returns null if Chromium can't ask for permission to
   // scan for BT devices.
   return !java_dialog_.is_null();
 }
 
 void BluetoothChooserAndroid::SetAdapterPresence(AdapterPresence presence) {
+  JNIEnv* env = AttachCurrentThread();
   if (presence != AdapterPresence::POWERED_ON) {
-    Java_BluetoothChooserDialog_notifyAdapterTurnedOff(AttachCurrentThread(),
-                                                       java_dialog_.obj());
+    Java_BluetoothChooserDialog_notifyAdapterTurnedOff(env, java_dialog_.obj());
   } else {
-    Java_BluetoothChooserDialog_notifyAdapterTurnedOn(AttachCurrentThread(),
-                                                      java_dialog_.obj());
+    Java_BluetoothChooserDialog_notifyAdapterTurnedOn(env, java_dialog_.obj());
+    RestartSearch();
   }
 }
 
 void BluetoothChooserAndroid::ShowDiscoveryState(DiscoveryState state) {
   // These constants are used in BluetoothChooserDialog.notifyDiscoveryState.
   int java_state = -1;
   switch (state) {
     case DiscoveryState::FAILED_TO_START:
       java_state = 0;
       break;
@@ skipping 42 matching lines @@
       return;
     case 2:
       event_handler_.Run(
           Event::SELECTED,
           base::android::ConvertJavaStringToUTF8(env, device_id));
       return;
   }
   NOTREACHED();
 }
 
-void BluetoothChooserAndroid::RestartSearch(JNIEnv* env,
-                                            const JavaParamRef<jobject>& obj) {
+void BluetoothChooserAndroid::RestartSearch() {
   event_handler_.Run(Event::RESCAN, "");
 }
 
+void BluetoothChooserAndroid::RestartSearch(JNIEnv*,
+                                            const JavaParamRef<jobject>&) {
+  RestartSearch();
+}
+
 void BluetoothChooserAndroid::ShowBluetoothOverviewLink(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   OpenURL(chrome::kChooserBluetoothOverviewURL);
   event_handler_.Run(Event::SHOW_OVERVIEW_HELP, "");
 }
 
 void BluetoothChooserAndroid::ShowBluetoothAdapterOffLink(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
@@ skipping 11 matching lines @@
 // static
 bool BluetoothChooserAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 void BluetoothChooserAndroid::OpenURL(const char* url) {
   web_contents_->OpenURL(content::OpenURLParams(
       GURL(url), content::Referrer(), NEW_FOREGROUND_TAB,
       ui::PAGE_TRANSITION_AUTO_TOPLEVEL, false /* is_renderer_initiated */));
 }