| Index: chrome/app/chrome_watcher_command_line_unittest_win.cc
|
| diff --git a/chrome/app/chrome_watcher_command_line_unittest_win.cc b/chrome/app/chrome_watcher_command_line_unittest_win.cc
|
| index 6aac76e80a8f09285873c9680feb2fbcfaa7dd09..b31620380c8f6751d87e89bb82387b3622fe535c 100644
|
| --- a/chrome/app/chrome_watcher_command_line_unittest_win.cc
|
| +++ b/chrome/app/chrome_watcher_command_line_unittest_win.cc
|
| @@ -8,22 +8,29 @@
|
|
|
| #include "base/command_line.h"
|
| #include "base/files/file_path.h"
|
| -#include "base/process/process.h"
|
| +#include "base/process/process_handle.h"
|
| #include "base/win/scoped_handle.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| TEST(ChromeWatcherCommandLineTest, BasicTest) {
|
| - base::Process current = base::Process::Open(base::GetCurrentProcId());
|
| - ASSERT_TRUE(current.IsValid());
|
| + // Ownership of these handles is passed to the ScopedHandles below via
|
| + // InterpretChromeWatcherCommandLine().
|
| + base::ProcessHandle current =
|
| + ::OpenProcess(PROCESS_QUERY_INFORMATION | SYNCHRONIZE,
|
| + TRUE, // Inheritable
|
| + ::GetCurrentProcessId());
|
| + ASSERT_NE(nullptr, current);
|
| +
|
| HANDLE event = ::CreateEvent(nullptr, FALSE, FALSE, nullptr);
|
| + ASSERT_NE(nullptr, event);
|
|
|
| base::CommandLine cmd_line = GenerateChromeWatcherCommandLine(
|
| - base::FilePath(L"example.exe"), current.Handle(), event);
|
| + base::FilePath(L"example.exe"), current, event);
|
|
|
| base::win::ScopedHandle current_result;
|
| base::win::ScopedHandle event_result;
|
| ASSERT_TRUE(InterpretChromeWatcherCommandLine(cmd_line, ¤t_result,
|
| &event_result));
|
| - ASSERT_EQ(current.Handle(), current_result.Get());
|
| + ASSERT_EQ(current, current_result.Get());
|
| ASSERT_EQ(event, event_result.Get());
|
| }
|
|
|