[Bluetooth] Disable verbose log toggle for dispatcher, newblue, and kernel

To prepare for enabling debug logs for Googlers by default, we disable
the dispatcher and newblue components which are not currently used. Also
leave the kernel verbose logs off since we are not ready with enabling
it by default. This leaves only bluetoothd verbose logs to be
configurable according to the plan go/chromeos-bluetoothd-verbose-logs.
Kernel debug level can still be configured with the D-Bus command
org.chromium.Bluetooth.Debug.SetLevels (implemented in CL:1725690).

Bug: b:172273364
Change-Id: I0080f50f0cda270928b308fcd72458855513faad
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2536949
Commit-Queue: Sonny Sasaka <sonnysasaka@chromium.org>
Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/heads/master@{#828416}

chrome/browser/chromeos/bluetooth/debug_logs_manager.cc

@@ -87,8 +87,8 @@ void DebugLogsManager::SendDBusVerboseLogsMessage(bool enable,
   bluez::BluezDBusManager::Get()
       ->GetBluetoothDebugManagerClient()
       ->SetLogLevels(
-          level /* dispatcher */, level /* newblue */, level /* bluez */,
-          level /* kernel */,
+          0 /* dispatcher */, 0 /* newblue */, level /* bluez */,
+          0 /* kernel */,
           base::BindOnce(&DebugLogsManager::OnVerboseLogsEnableSuccess,
                          weak_ptr_factory_.GetWeakPtr(), enable),
           base::BindOnce(&DebugLogsManager::OnVerboseLogsEnableError,

chrome/browser/chromeos/bluetooth/debug_logs_manager_unittest.cc

@@ -121,35 +121,35 @@ TEST_F(DebugLogsManagerTest, ChangeDebugLogsState) {
 TEST_F(DebugLogsManagerTest, SendVerboseLogsRequestUponLoginAndLogout) {
   SetDebugFlagState(true /* debug_flag_enabled */);
   InstantiateDebugManager(kTestGooglerEmail);
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 0);
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 0);
   debug_manager()->ChangeDebugLogsState(
       true /* should_debug_logs_be_enabled */);
-  // Dispatcher level is updated only on login/logout, so now it stays the same.
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 0);
+  // BlueZ level is updated only on login/logout, so now it stays the same.
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 0);
 
   // Deletion and Recreation of DebugManager simulates logout-login event
   DestroyDebugManager();
   InstantiateDebugManager(kTestGooglerEmail);
-  // After login, dispatcher level should change
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 1);
+  // After login, bluez level should change
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 1);
 
   DestroyDebugManager();
-  // After logout, dispatcher level should reset to 0
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 0);
+  // After logout, bluez level should reset to 0
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 0);
 
   InstantiateDebugManager(kTestGooglerEmail);
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 1);
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 1);
 
   debug_manager()->ChangeDebugLogsState(
       false /* should_debug_logs_be_enabled */);
-  // Dispatcher level is updated only on login/logout, so now it stays the same.
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 1);
+  // BlueZ level is updated only on login/logout, so now it stays the same.
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 1);
   DestroyDebugManager();
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 0);
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 0);
 
   InstantiateDebugManager(kTestGooglerEmail);
-  // dispatcher level should still be 0 because logging is disabled
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 0);
+  // bluez level should still be 0 because logging is disabled
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 0);
 }
 
 TEST_F(DebugLogsManagerTest, RetryUponSetVerboseLogsFailure) {
@@ -158,7 +158,7 @@ TEST_F(DebugLogsManagerTest, RetryUponSetVerboseLogsFailure) {
 
   SetDebugFlagState(true /* debug_flag_enabled */);
   InstantiateDebugManager(kTestGooglerEmail);
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 0);
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 0);
   debug_manager()->ChangeDebugLogsState(
       true /* should_debug_logs_be_enabled */);
 
@@ -169,8 +169,8 @@ TEST_F(DebugLogsManagerTest, RetryUponSetVerboseLogsFailure) {
 
   EXPECT_EQ(fake_bluetooth_debug_manager_client()->set_log_levels_fail_count(),
             1);
-  // Message is re-sent upon failing, eventually dispatcher level should change.
-  EXPECT_EQ(fake_bluetooth_debug_manager_client()->dispatcher_level(), 1);
+  // Message is re-sent upon failing, eventually bluez level should change.
+  EXPECT_EQ(fake_bluetooth_debug_manager_client()->bluez_level(), 1);
 }
 
 }  // namespace bluetooth

device/bluetooth/dbus/fake_bluetooth_debug_manager_client.cc

@@ -27,7 +27,7 @@ void FakeBluetoothDebugManagerClient::SetLogLevels(
     return;
   }
 
-  dispatcher_level_ = dispatcher_level;
+  bluez_level_ = bluez_level;
   std::move(callback).Run();
 }
 

device/bluetooth/dbus/fake_bluetooth_debug_manager_client.h

@@ -36,7 +36,7 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothDebugManagerClient
   void MakeNextSetLogLevelsFail();
 
   int set_log_levels_fail_count() const { return set_log_levels_fail_count_; }
-  int dispatcher_level() const { return dispatcher_level_; }
+  int bluez_level() const { return bluez_level_; }
 
  private:
   // When set, next call to SetLogLevels() will fail.
@@ -45,8 +45,8 @@ class DEVICE_BLUETOOTH_EXPORT FakeBluetoothDebugManagerClient
   // Counter to track how many times SetLogLevels() fails.
   int set_log_levels_fail_count_ = 0;
 
-  // The latest dispatcher_level assigned.
-  int dispatcher_level_ = 0;
+  // The latest bluez_level assigned.
+  int bluez_level_ = 0;
 };
 
 }  // namespace bluez