update_engine: Migrate base/guid.h usages to base/uuid.h
base/guid.h was deleted in libchrome in crrev.com/c/4507692
The old base::GenerateGUID() in CrOS libchrome was already using
base::UuidGenerateRandomV4().AsLowercaseString() under the hood. So this
refactor will not change the format of generated string.
BUG=b:286495058
TEST=cros_workon_make --test
Change-Id: I8fda887c0f566ad4669bbf0fc78fca917aa4ffd3
Reviewed-on: https://chromium-review.googlesource.com/c/aosp/platform/system/update_engine/+/4609927
Auto-Submit: Yi Xie <[email protected]>
Reviewed-by: Jae Hoon Kim <[email protected]>
Tested-by: Yi Xie <[email protected]>
Commit-Queue: Jae Hoon Kim <[email protected]>
diff --git a/cros/omaha_request_builder_xml.cc b/cros/omaha_request_builder_xml.cc
index 9eeb830..dc6ad53 100644
--- a/cros/omaha_request_builder_xml.cc
+++ b/cros/omaha_request_builder_xml.cc
@@ -22,13 +22,13 @@
#include <numeric>
#include <string>
-#include <base/guid.h>
#include <base/logging.h>
#include <base/notreached.h>
#include <base/strings/string_number_conversions.h>
#include <base/strings/string_util.h>
#include <base/strings/stringprintf.h>
#include <base/time/time.h>
+#include <base/uuid.h>
#include "update_engine/common/constants.h"
#include "update_engine/common/cros_healthd_interface.h"
@@ -450,7 +450,9 @@
" protocol=\"3.0\" updater=\"%s\" updaterversion=\"%s\""
" installsource=\"%s\" ismachine=\"1\" recoverykeyversion=\"%s\" "
"%s>\n%s%s%s</request>\n",
- base::GenerateGUID().c_str() /* requestid */,
+ base::Uuid::GenerateRandomV4()
+ .AsLowercaseString()
+ .c_str() /* requestid */,
session_id_.c_str(),
constants::kOmahaUpdaterID,
kOmahaUpdaterVersion,
diff --git a/cros/omaha_request_builder_xml_unittest.cc b/cros/omaha_request_builder_xml_unittest.cc
index de0f70e..ec4ccba 100644
--- a/cros/omaha_request_builder_xml_unittest.cc
+++ b/cros/omaha_request_builder_xml_unittest.cc
@@ -20,9 +20,9 @@
#include <utility>
#include <vector>
-#include <base/guid.h>
#include <base/logging.h>
#include <base/strings/stringprintf.h>
+#include <base/uuid.h>
#include <gtest/gtest.h>
#include "update_engine/cros/fake_system_state.h"
@@ -169,11 +169,12 @@
FindAttributeKeyValueInXml(request_xml, key, kGuidSize);
// A valid |request_id| is either a GUID version 4 or empty string.
if (!request_id.empty())
- EXPECT_TRUE(base::IsValidGUID(request_id));
+ EXPECT_TRUE(base::Uuid::ParseLowercase(request_id).is_valid());
}
TEST_F(OmahaRequestBuilderXmlTest, GetRequestXmlSessionIdTest) {
- const string gen_session_id = base::GenerateGUID();
+ const string gen_session_id =
+ base::Uuid::GenerateRandomV4().AsLowercaseString();
OmahaRequestBuilderXml omaha_request{
nullptr, false, false, 0, 0, 0, gen_session_id};
const string request_xml = omaha_request.GetRequest();
@@ -182,7 +183,7 @@
FindAttributeKeyValueInXml(request_xml, key, kGuidSize);
// A valid |session_id| is either a GUID version 4 or empty string.
if (!session_id.empty()) {
- EXPECT_TRUE(base::IsValidGUID(session_id));
+ EXPECT_TRUE(base::Uuid::ParseLowercase(session_id).is_valid());
}
EXPECT_EQ(gen_session_id, session_id);
}
diff --git a/cros/update_attempter.cc b/cros/update_attempter.cc
index 184f945..c022a90 100644
--- a/cros/update_attempter.cc
+++ b/cros/update_attempter.cc
@@ -851,7 +851,7 @@
// The session ID needs to be kept throughout the update flow. The value
// of the session ID will reset/update only when it is a new update flow.
- session_id_ = base::GenerateGUID();
+ session_id_ = base::Uuid::GenerateRandomV4().AsLowercaseString();
// Actions:
auto update_check_fetcher = std::make_unique<LibcurlHttpFetcher>(
diff --git a/cros/update_attempter.h b/cros/update_attempter.h
index 609804b..38d389d 100644
--- a/cros/update_attempter.h
+++ b/cros/update_attempter.h
@@ -26,8 +26,8 @@
#include <vector>
#include <base/functional/bind.h>
-#include <base/guid.h>
#include <base/time/time.h>
+#include <base/uuid.h>
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include "update_engine/certificate_checker.h"
