Replace base::GUID uses with base::Uuid (175/N)
`base::GUID` has been renamed, and is set to be removed. This CL is
part of a batch of changes replacing all uses of `base::GUID`, with
`base::Uuid`, and its associated counterparts.
Additionally, deprecated functions in `base/uuid.h` are also also having
their uses removed wherever they occur.
Changes for path: /chrome/browser/ui/ash/holding_space
This CL was uploaded by git cl split.
R=dmblack@google.com
Bug: 1428566
Change-Id: I4978d7f84a640d3a055626a3133936cca30ce9fe
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4454575
Commit-Queue: David Black <dmblack@google.com>
Reviewed-by: David Black <dmblack@google.com>
Auto-Submit: Claudio DeSouza <cdesouza@igalia.com>
Cr-Commit-Position: refs/heads/main@{#1133288}
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
index df0ef783..ab7d861 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_keyed_service_browsertest.cc
@@ -821,7 +821,7 @@
// Create a `crosapi::mojom::DownloadItem`.
auto download = crosapi::mojom::DownloadItem::New();
- download->guid = base::GUID::GenerateRandomV4().AsLowercaseString();
+ download->guid = base::Uuid::GenerateRandomV4().AsLowercaseString();
download->received_bytes = 0;
download->has_received_bytes = true;
download->total_bytes = -1;
diff --git a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc
index c067186..2fca724 100644
--- a/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc
+++ b/chrome/browser/ui/ash/holding_space/holding_space_ui_browsertest.cc
@@ -32,7 +32,6 @@
#include "base/files/file_util.h"
#include "base/functional/bind.h"
#include "base/functional/callback_helpers.h"
-#include "base/guid.h"
#include "base/run_loop.h"
#include "base/scoped_observation.h"
#include "base/task/sequenced_task_runner.h"
@@ -40,6 +39,7 @@
#include "base/test/bind.h"
#include "base/test/scoped_feature_list.h"
#include "base/test/scoped_locale.h"
+#include "base/uuid.h"
#include "build/build_config.h"
#include "chrome/browser/ash/crosapi/crosapi_ash.h"
#include "chrome/browser/ash/crosapi/crosapi_manager.h"
@@ -1795,7 +1795,7 @@
// Mock `download::DownloadItem::GetGuid()`.
ON_CALL(*ash_download_item, GetGuid)
.WillByDefault(testing::ReturnRefOfCopy(
- base::GUID::GenerateRandomV4().AsLowercaseString()));
+ base::Uuid::GenerateRandomV4().AsLowercaseString()));
// Mock `download::DownloadItem::GetId()`.
ON_CALL(*ash_download_item, GetId).WillByDefault(testing::Invoke([]() {
@@ -1942,7 +1942,7 @@
auto lacros_download_item = crosapi::mojom::DownloadItem::New();
lacros_download_item->guid =
- base::GUID::GenerateRandomV4().AsLowercaseString();
+ base::Uuid::GenerateRandomV4().AsLowercaseString();
lacros_download_item->state = state;
lacros_download_item->full_path = file_path;
lacros_download_item->target_file_path = target_file_path;