Get updater_unittests to build with std::u16string.

Bug: 911896 Change-Id: I0f1218e2ee7412cb7f87b70e23d1eff8c9e96ee2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2693855 Reviewed-by: Joshua Pawlicki <[email protected]> Commit-Queue: Peter Kasting <[email protected]> Cr-Commit-Position: refs/heads/master@{#854283}
blueboxd · Feb 16, 2021 · 7420c01 · 7420c01
1 parent 51aa487
commit 7420c01
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/chrome/updater/win/task_scheduler_unittest.cc b/chrome/updater/win/task_scheduler_unittest.cc
@@ -102,9 +102,9 @@ TEST_F(TaskSchedulerTests, RunAProgramNow) {
 
   // Create a unique name for a shared event to be waited for in this process
   // and signaled in the test process to confirm it was scheduled and ran.
-  const base::string16 event_name =
+  const std::wstring event_name =
       base::StrCat({kTestProcessExecutableName, L"-",
-                    base::NumberToString16(::GetCurrentProcessId())});
+                    base::NumberToWString(::GetCurrentProcessId())});
   base::WaitableEvent event(base::win::ScopedHandle(
       ::CreateEvent(nullptr, FALSE, FALSE, event_name.c_str())));
   ASSERT_NE(event.handle(), nullptr);
@@ -206,7 +206,7 @@ TEST_F(TaskSchedulerTests, GetTaskNameList) {
                                     TaskScheduler::TRIGGER_TYPE_HOURLY, false));
   EXPECT_TRUE(task_scheduler_->IsTaskRegistered(kTaskName2));
 
-  std::vector<base::string16> task_names;
+  std::vector<std::wstring> task_names;
   EXPECT_TRUE(task_scheduler_->GetTaskNameList(&task_names));
   EXPECT_TRUE(base::Contains(task_names, kTaskName1));
   EXPECT_TRUE(base::Contains(task_names, kTaskName2));
@@ -227,7 +227,7 @@ TEST_F(TaskSchedulerTests, GetTasksIncludesHidden) {
 
   EXPECT_TRUE(task_scheduler_->IsTaskRegistered(kTaskName1));
 
-  std::vector<base::string16> task_names;
+  std::vector<std::wstring> task_names;
   EXPECT_TRUE(task_scheduler_->GetTaskNameList(&task_names));
   EXPECT_TRUE(base::Contains(task_names, kTaskName1));
 

diff --git a/chrome/updater/win/test/test_executables.cc b/chrome/updater/win/test/test_executables.cc
@@ -22,7 +22,7 @@ namespace updater {
 
 // If you add another test executable here, also add it to the data_deps in
 // the "test_executables" target of updater/win/test/BUILD.gn.
-const base::char16 kTestProcessExecutableName[] = L"updater_test_process.exe";
+const wchar_t kTestProcessExecutableName[] = L"updater_test_process.exe";
 
 base::Process LongRunningProcess(base::CommandLine* cmd) {
   base::FilePath exe_dir;
@@ -43,7 +43,7 @@ base::Process LongRunningProcess(base::CommandLine* cmd) {
       base::WaitableEvent::InitialState::NOT_SIGNALED);
   command_line.AppendSwitchNative(
       updater::kInitDoneNotifierSwitch,
-      base::NumberToString16(
+      base::NumberToWString(
           base::win::HandleToUint32(init_done_event->handle())));
 
   if (cmd)

diff --git a/chrome/updater/win/test/test_executables.h b/chrome/updater/win/test/test_executables.h
@@ -15,10 +15,10 @@ class CommandLine;
 namespace updater {
 
 // The name of the service executable used for tests.
-extern const base::char16 kTestServiceExecutableName[];
+extern const wchar_t kTestServiceExecutableName[];
 
 // The name of the executable used for tests.
-extern const base::char16 kTestProcessExecutableName[];
+extern const wchar_t kTestProcessExecutableName[];
 
 // Creates a process that will run for a minute, which is long enough to be
 // killed by a reasonably fast unit or integration test.

diff --git a/chrome/updater/win/test/test_process_main.cc b/chrome/updater/win/test/test_process_main.cc
@@ -40,7 +40,7 @@ int main(int, char**) {
   if (command_line->HasSwitch(updater::kTestEventToSignal)) {
     VLOG(1) << "Process is signaling event '" << updater::kTestEventToSignal
             << "'";
-    base::string16 event_name =
+    std::wstring event_name =
         command_line->GetSwitchValueNative(updater::kTestEventToSignal);
     base::win::ScopedHandle handle(
         ::OpenEvent(EVENT_ALL_ACCESS, TRUE, event_name.c_str()));