Migrate download_protection code to new DM token class.

Migrates RetrieveDMToken calls to use the new BrowserDMToken class.

Bug: 1020296
Change-Id: Icef580e243430d73b6c1c42b273a8540277481d9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1904234
Commit-Queue: Dominique Fauteux-Chapleau <domfc@chromium.org>
Reviewed-by: Tien Mai <tienmai@chromium.org>
Reviewed-by: Daniel Rubery <drubery@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714196}

chrome/browser/safe_browsing/download_protection/binary_upload_service.cc

@@ -29,6 +29,8 @@
 #include "content/public/browser/browser_thread.h"
 #include "net/http/http_status_code.h"
 
+using BrowserDMToken = policy::BrowserDMTokenStorage::BrowserDMToken;
+
 namespace safe_browsing {
 namespace {
 
@@ -38,13 +40,19 @@ const int kScanningTimeoutSeconds = 5 * 60;           // 5 minutes
 // here.
 const char kSbBinaryUploadUrl[] = "";
 
-std::string* GetTestingDMToken() {
-  static std::string dm_token;
+const char** GetTestingDMTokenStorage() {
+  static const char* dm_token = "";
   return &dm_token;
 }
 
-std::string GetDMToken() {
-  std::string dm_token = *GetTestingDMToken();
+BrowserDMToken GetTestingDMToken() {
+  const char* dm_token = *GetTestingDMTokenStorage();
+  return dm_token && dm_token[0] ? BrowserDMToken::CreateValidToken(dm_token)
+                                 : BrowserDMToken::CreateEmptyToken();
+}
+
+policy::BrowserDMTokenStorage::BrowserDMToken GetDMToken() {
+  auto dm_token = GetTestingDMToken();
 
 #if !defined(OS_CHROMEOS)
   // This is not compiled on chromeos because
@@ -52,9 +60,9 @@ std::string GetDMToken() {
   // policy::BrowserDMTokenStorage::Get()->RetrieveDMToken() does not return a
   // valid token either.  Once these are fixed the #if !defined can be removed.
 
-  if (dm_token.empty() &&
+  if (dm_token.is_empty() &&
       policy::ChromeBrowserCloudManagementController::IsEnabled()) {
-    dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveDMToken();
+    dm_token = policy::BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
   }
 #endif
 
@@ -412,8 +420,8 @@ void BinaryUploadService::IsAuthorized(AuthorizationCallback callback) {
   if (!can_upload_data_.has_value()) {
     // Send a request to check if the browser can upload data.
     if (!pending_validate_data_upload_request_) {
-      std::string dm_token = GetDMToken();
-      if (dm_token.empty()) {
+      auto dm_token = GetDMToken();
+      if (!dm_token.is_valid()) {
         std::move(callback).Run(false);
         return;
       }
@@ -422,7 +430,7 @@ void BinaryUploadService::IsAuthorized(AuthorizationCallback callback) {
       auto request = std::make_unique<ValidateDataUploadRequest>(base::BindOnce(
           &BinaryUploadService::ValidateDataUploadRequestCallback,
           weakptr_factory_.GetWeakPtr()));
-      request->set_dm_token(dm_token);
+      request->set_dm_token(dm_token.value());
       UploadForDeepScanning(std::move(request));
     }
     authorization_callbacks_.push_back(std::move(callback));

chrome/browser/safe_browsing/download_protection/check_client_download_request.cc

@@ -43,6 +43,7 @@
 namespace safe_browsing {
 
 using content::BrowserThread;
+using policy::BrowserDMTokenStorage;
 
 namespace {
 
@@ -359,8 +360,9 @@ void CheckClientDownloadRequest::UploadBinary(
     request->set_request_malware_scan(std::move(malware_request));
   }
 
-  request->set_dm_token(
-      policy::BrowserDMTokenStorage::Get()->RetrieveDMToken());
+  auto dm_token = BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken();
+  DCHECK(dm_token.is_valid());
+  request->set_dm_token(dm_token.value());
 
   service()->UploadForDeepScanning(profile, std::move(request));
 }
@@ -389,8 +391,9 @@ bool CheckClientDownloadRequest::ShouldUploadForDlpScan() {
           CheckContentComplianceValues::CHECK_UPLOADS_AND_DOWNLOADS)
     return false;
 
-  // If there's no DM token, the upload will fail, so we can skip uploading now.
-  if (policy::BrowserDMTokenStorage::Get()->RetrieveDMToken().empty())
+  // If there's no valid DM token, the upload will fail, so we can skip
+  // uploading now.
+  if (!BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken().is_valid())
     return false;
 
   const base::ListValue* domains = g_browser_process->local_state()->GetList(
@@ -428,8 +431,9 @@ bool CheckClientDownloadRequest::ShouldUploadForMalwareScan(
           SendFilesForMalwareCheckValues::SEND_UPLOADS_AND_DOWNLOADS)
     return false;
 
-  // If there's no DM token, the upload will fail, so we can skip uploading now.
-  return !policy::BrowserDMTokenStorage::Get()->RetrieveDMToken().empty();
+  // If there's no valid DM token, the upload will fail, so we can skip
+  // uploading now.
+  return BrowserDMTokenStorage::Get()->RetrieveBrowserDMToken().is_valid();
 }
 
 void CheckClientDownloadRequest::OnDeepScanningComplete(