Remove RetrieveDMToken function.

Remove the old std::string signature so future code uses the DMToken
function instead. Also rename RetrieveBrowserDMToken to
RetrieveDMToken to keep function name consistent with the rest of
BrowserDMTokenStorage.

Bug: 1020296
Change-Id: Ie3eb3cc44d9c0ca9503971a843bd9ff10ec6dfae
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1924547Reviewed-by: Daniel Rubery <drubery@chromium.org>
Reviewed-by: Tien Mai <tienmai@chromium.org>
Reviewed-by: Owen Min <zmin@chromium.org>
Reviewed-by: Greg Thompson <grt@chromium.org>
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#717717}

chrome/browser/enterprise_reporting/report_scheduler.cc

@@ -36,8 +36,8 @@ const int kMaximumTrackedProfiles = 21;
 // Reads DM token and client id. Returns true if boths are non empty.
 bool GetDMTokenAndDeviceId(std::string* dm_token, std::string* client_id) {
   DCHECK(dm_token && client_id);
-  auto browser_dm_token =
-      policy::BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+  policy::DMToken browser_dm_token =
+      policy::BrowserDMTokenStorage::Get()->RetrieveDMToken();
   *client_id = policy::BrowserDMTokenStorage::Get()->RetrieveClientId();
 
   if (!browser_dm_token.is_valid() || client_id->empty()) {

chrome/browser/extensions/api/enterprise_reporting_private/enterprise_reporting_private_api.cc

@@ -68,7 +68,7 @@ EnterpriseReportingPrivateUploadChromeDesktopReportFunction::
       std::string() /* manufacture_date */, device_management_service,
       std::move(url_loader_factory), nullptr,
       policy::CloudPolicyClient::DeviceDMTokenCallback());
-  dm_token_ = policy::BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+  dm_token_ = policy::BrowserDMTokenStorage::Get()->RetrieveDMToken();
   client_id_ = policy::BrowserDMTokenStorage::Get()->RetrieveClientId();
 }
 

chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_event_router.cc

@@ -601,7 +601,7 @@ void SafeBrowsingPrivateEventRouter::InitRealtimeReportingClientCallback(
   // Therefore, it is OK to retrieve the dm token once here on initialization
   // of the router to determine if real-time reporting can be enabled or not.
   policy::DMToken dm_token =
-      policy::BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+      policy::BrowserDMTokenStorage::Get()->RetrieveDMToken();
   std::string client_id =
       policy::BrowserDMTokenStorage::Get()->RetrieveClientId();
 

chrome/browser/policy/browser_dm_token_storage.cc

@@ -124,11 +124,7 @@ void BrowserDMTokenStorage::ClearDMToken(StoreCallback callback) {
   StoreDMToken("", std::move(callback));
 }
 
-std::string BrowserDMTokenStorage::RetrieveDMToken() {
-  return RetrieveBrowserDMToken().value();
-}
-
-DMToken BrowserDMTokenStorage::RetrieveBrowserDMToken() {
+DMToken BrowserDMTokenStorage::RetrieveDMToken() {
   DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
   DCHECK(!store_callback_);
 

chrome/browser/policy/browser_dm_token_storage.h

@@ -57,11 +57,7 @@ class BrowserDMTokenStorage {
   void ClearDMToken(StoreCallback callback);
   // Returns an already stored DM token. An empty token is returned if no DM
   // token exists on the system or an error is encountered.
-  // TODO(domfc): Remove overload after updating callers. Note that the names
-  //              are different because you cannot overload functions that only
-  //              differ in their return type.
-  std::string RetrieveDMToken();
-  DMToken RetrieveBrowserDMToken();
+  DMToken RetrieveDMToken();
   // Must be called after the DM token is saved, to ensure that the callback is
   // invoked.
   void OnDMTokenStored(bool success);

chrome/browser/policy/browser_dm_token_storage_unittest.cc

@@ -114,7 +114,7 @@ TEST_F(BrowserDMTokenStorageTest, RetrieveEnrollmentToken) {
 
 TEST_P(BrowserDMTokenStorageStoreAndRetrieveTest, StoreDMToken) {
   storage_.SetDMToken(GetParam().dm_token_to_store);
-  auto dm_token = storage_.RetrieveBrowserDMToken();
+  DMToken dm_token = storage_.RetrieveDMToken();
   if (GetParam().expect_valid || GetParam().expect_empty) {
     EXPECT_EQ(GetParam().expected_retrieved_dm_token, dm_token.value());
   }
@@ -131,28 +131,28 @@ TEST_P(BrowserDMTokenStorageStoreAndRetrieveTest, StoreDMToken) {
 
 TEST_F(BrowserDMTokenStorageTest, InvalidateDMToken) {
   storage_.SetDMToken(kDMToken1);
-  auto initial_dm_token = storage_.RetrieveBrowserDMToken();
+  DMToken initial_dm_token = storage_.RetrieveDMToken();
   EXPECT_EQ(kDMToken1, initial_dm_token.value());
   EXPECT_TRUE(initial_dm_token.is_valid());
 
   storage_.InvalidateDMToken(base::DoNothing());
-  auto invalid_dm_token = storage_.RetrieveBrowserDMToken();
+  DMToken invalid_dm_token = storage_.RetrieveDMToken();
   EXPECT_TRUE(invalid_dm_token.is_invalid());
 }
 
 TEST_F(BrowserDMTokenStorageTest, ClearDMToken) {
   storage_.SetDMToken(kDMToken1);
-  auto initial_dm_token = storage_.RetrieveBrowserDMToken();
+  DMToken initial_dm_token = storage_.RetrieveDMToken();
   EXPECT_EQ(kDMToken1, initial_dm_token.value());
   EXPECT_TRUE(initial_dm_token.is_valid());
 
   storage_.ClearDMToken(base::DoNothing());
-  auto empty_dm_token = storage_.RetrieveBrowserDMToken();
+  DMToken empty_dm_token = storage_.RetrieveDMToken();
   EXPECT_TRUE(empty_dm_token.is_empty());
 }
 
 TEST_P(BrowserDMTokenStorageStoreAndRetrieveTest, RetrieveDMToken) {
-  auto dm_token = storage_.RetrieveBrowserDMToken();
+  DMToken dm_token = storage_.RetrieveDMToken();
   if (GetParam().expect_valid || GetParam().expect_empty) {
     EXPECT_EQ(GetParam().expected_retrieved_dm_token, dm_token.value());
   }

chrome/browser/policy/chrome_browser_cloud_management_controller.cc

@@ -110,7 +110,7 @@ ChromeBrowserCloudManagementController::CreatePolicyManager(
 
   std::string enrollment_token =
       BrowserDMTokenStorage::Get()->RetrieveEnrollmentToken();
-  DMToken dm_token = BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+  DMToken dm_token = BrowserDMTokenStorage::Get()->RetrieveDMToken();
   std::string client_id = BrowserDMTokenStorage::Get()->RetrieveClientId();
 
   if (dm_token.is_empty())
@@ -119,8 +119,6 @@ ChromeBrowserCloudManagementController::CreatePolicyManager(
     VLOG(1) << "DM token = invalid";
   else if (dm_token.is_valid())
     VLOG(1) << "DM token = from persistence";
-  else
-    VLOG(1) << "DM token = unknown status";
 
   VLOG(1) << "Enrollment token = " << enrollment_token;
   VLOG(1) << "Client ID = " << client_id;
@@ -194,7 +192,7 @@ void ChromeBrowserCloudManagementController::Init(
   //      request a DM token in that case.
   std::string enrollment_token;
   std::string client_id;
-  auto dm_token = BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+  DMToken dm_token = BrowserDMTokenStorage::Get()->RetrieveDMToken();
 
   if (dm_token.is_invalid())
     return;
@@ -348,7 +346,7 @@ void ChromeBrowserCloudManagementController::
   // Start fetching policies.
   VLOG(1) << "Fetch policy after enrollment.";
   policy_fetcher_->SetupRegistrationAndFetchPolicy(
-      BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken(), client_id);
+      BrowserDMTokenStorage::Get()->RetrieveDMToken(), client_id);
   if (report_scheduler_) {
     report_scheduler_->OnDMTokenUpdated();
   }

chrome/browser/policy/chrome_browser_cloud_management_register_watcher.cc

@@ -42,7 +42,7 @@ RegisterResult ChromeBrowserCloudManagementRegisterWatcher::
     return RegisterResult::kNoEnrollmentNeeded;
 
   // We are already enrolled successfully.
-  if (token_storage->RetrieveBrowserDMToken().is_valid())
+  if (token_storage->RetrieveDMToken().is_valid())
     return RegisterResult::kEnrollmentSuccessBeforeDialogDisplayed;
 
   EnterpriseStartupDialog::DialogResultCallback callback = base::BindOnce(

chrome/browser/policy/cloud/chrome_browser_cloud_management_browsertest.cc

@@ -385,9 +385,9 @@ class MachineLevelUserCloudPolicyManagerTest : public InProcessBrowserTest {
     CloudPolicyStoreObserverStub observer;
 
     base::PathService::Get(chrome::DIR_USER_DATA, &user_data_dir);
-    auto browser_dm_token = dm_token.empty()
-                                ? DMToken::CreateEmptyTokenForTesting()
-                                : DMToken::CreateValidTokenForTesting(dm_token);
+    DMToken browser_dm_token =
+        dm_token.empty() ? DMToken::CreateEmptyTokenForTesting()
+                         : DMToken::CreateValidTokenForTesting(dm_token);
     std::unique_ptr<MachineLevelUserCloudPolicyStore> policy_store =
         MachineLevelUserCloudPolicyStore::Create(
             browser_dm_token, client_id, user_data_dir,
@@ -474,7 +474,7 @@ class ChromeBrowserCloudManagementEnrollmentTest
   }
 
   void VerifyEnrollmentResult() {
-    auto dm_token = BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+    DMToken dm_token = BrowserDMTokenStorage::Get()->RetrieveDMToken();
     if (is_enrollment_token_valid()) {
       EXPECT_TRUE(dm_token.is_valid());
       EXPECT_EQ("fake_device_management_token", dm_token.value());

chrome/browser/policy/cloud/chrome_browser_cloud_management_helper.cc

@@ -164,7 +164,7 @@ void MachineLevelUserCloudPolicyFetcher::InitializeManager(
 }
 
 void MachineLevelUserCloudPolicyFetcher::TryToFetchPolicy() {
-  auto dm_token = BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+  DMToken dm_token = BrowserDMTokenStorage::Get()->RetrieveDMToken();
   std::string client_id = BrowserDMTokenStorage::Get()->RetrieveClientId();
   if (dm_token.is_valid() && !client_id.empty())
     SetupRegistrationAndFetchPolicy(dm_token, client_id);

chrome/browser/safe_browsing/cloud_content_scanning/deep_scanning_dialog_delegate.cc

@@ -486,7 +486,7 @@ policy::DMToken DeepScanningDialogDelegate::GetDMToken() {
 
   if (dm_token.is_empty() &&
       policy::ChromeBrowserCloudManagementController::IsEnabled()) {
-    dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+    dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveDMToken();
   }
 #endif
 

chrome/browser/safe_browsing/download_protection/binary_upload_service.cc

@@ -55,7 +55,7 @@ policy::DMToken GetDMToken() {
 
   if (dm_token.is_empty() &&
       policy::ChromeBrowserCloudManagementController::IsEnabled()) {
-    dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+    dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveDMToken();
   }
 #endif
 

chrome/browser/safe_browsing/download_protection/check_client_download_request.cc

@@ -470,7 +470,7 @@ void CheckClientDownloadRequest::UploadBinary(
     request->set_request_malware_scan(std::move(malware_request));
   }
 
-  auto dm_token = BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+  policy::DMToken dm_token = BrowserDMTokenStorage::Get()->RetrieveDMToken();
   DCHECK(dm_token.is_valid());
   request->set_dm_token(dm_token.value());
 
@@ -504,7 +504,7 @@ bool CheckClientDownloadRequest::ShouldUploadForDlpScan() {
 
   // If there's no valid DM token, the upload will fail, so we can skip
   // uploading now.
-  if (!BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken().is_valid())
+  if (!BrowserDMTokenStorage::Get()->RetrieveDMToken().is_valid())
     return false;
 
   const base::ListValue* domains = g_browser_process->local_state()->GetList(
@@ -544,7 +544,7 @@ bool CheckClientDownloadRequest::ShouldUploadForMalwareScan(
 
   // If there's no valid DM token, the upload will fail, so we can skip
   // uploading now.
-  return BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken().is_valid();
+  return BrowserDMTokenStorage::Get()->RetrieveDMToken().is_valid();
 }
 
 void CheckClientDownloadRequest::OnDeepScanningComplete(

chrome/browser/upgrade_detector/upgrade_detector_impl.cc

@@ -417,11 +417,10 @@ bool UpgradeDetectorImpl::DetectOutdatedInstall() {
       return false;
 
 #if defined(OS_WIN)
+    // TODO(crbug/1027107): Replace with a more generic CBCM check.
     // Don't show the update bubbles to enterprise users.
     if (base::IsMachineExternallyManaged() ||
-        policy::BrowserDMTokenStorage::Get()
-            ->RetrieveBrowserDMToken()
-            .is_valid()) {
+        policy::BrowserDMTokenStorage::Get()->RetrieveDMToken().is_valid()) {
       return false;
     }
 #endif