Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(309)

Side by Side Diff: components/browser_watcher/exit_code_watcher_win_unittest.cc

Issue 1513043002: clang/win: Let remaining chromium_code targets build with -Wextra. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/browser_watcher/exit_code_watcher_win.h" 5 #include "components/browser_watcher/exit_code_watcher_win.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/process/process.h" 8 #include "base/process/process.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 } 85 }
86 86
87 base::Process OpenSelfWithAccess(uint32 access) { 87 base::Process OpenSelfWithAccess(uint32 access) {
88 return base::Process::OpenWithAccess(base::GetCurrentProcId(), access); 88 return base::Process::OpenWithAccess(base::GetCurrentProcId(), access);
89 } 89 }
90 90
91 void VerifyWroteExitCode(base::ProcessId proc_id, int exit_code) { 91 void VerifyWroteExitCode(base::ProcessId proc_id, int exit_code) {
92 base::win::RegistryValueIterator it( 92 base::win::RegistryValueIterator it(
93 HKEY_CURRENT_USER, kRegistryPath); 93 HKEY_CURRENT_USER, kRegistryPath);
94 94
95 ASSERT_EQ(1, it.ValueCount()); 95 ASSERT_EQ(1u, it.ValueCount());
96 base::win::RegKey key(HKEY_CURRENT_USER, 96 base::win::RegKey key(HKEY_CURRENT_USER,
97 kRegistryPath, 97 kRegistryPath,
98 KEY_QUERY_VALUE); 98 KEY_QUERY_VALUE);
99 99
100 // The value name should encode the process id at the start. 100 // The value name should encode the process id at the start.
101 EXPECT_TRUE(base::StartsWith( 101 EXPECT_TRUE(base::StartsWith(
102 it.Name(), 102 it.Name(),
103 base::StringPrintf(L"%d-", proc_id), 103 base::StringPrintf(L"%d-", proc_id),
104 base::CompareCase::SENSITIVE)); 104 base::CompareCase::SENSITIVE));
105 DWORD value = 0; 105 DWORD value = 0;
106 ASSERT_EQ(ERROR_SUCCESS, key.ReadValueDW(it.Name(), &value)); 106 ASSERT_EQ(ERROR_SUCCESS, key.ReadValueDW(it.Name(), &value));
107 ASSERT_EQ(exit_code, value); 107 ASSERT_EQ(exit_code, static_cast<int>(value));
108 } 108 }
109 109
110 protected: 110 protected:
111 base::CommandLine cmd_line_; 111 base::CommandLine cmd_line_;
112 registry_util::RegistryOverrideManager override_manager_; 112 registry_util::RegistryOverrideManager override_manager_;
113 }; 113 };
114 114
115 } // namespace 115 } // namespace
116 116
117 TEST_F(ExitCodeWatcherTest, ExitCodeWatcherInvalidHandleFailsInit) { 117 TEST_F(ExitCodeWatcherTest, ExitCodeWatcherInvalidHandleFailsInit) {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 // Kill the sleeper, and make sure it's exited before we continue. 161 // Kill the sleeper, and make sure it's exited before we continue.
162 ASSERT_NO_FATAL_FAILURE(sleeper.Kill(kExitCode, true)); 162 ASSERT_NO_FATAL_FAILURE(sleeper.Kill(kExitCode, true));
163 163
164 watcher.WaitForExit(); 164 watcher.WaitForExit();
165 EXPECT_EQ(kExitCode, watcher.exit_code()); 165 EXPECT_EQ(kExitCode, watcher.exit_code());
166 166
167 VerifyWroteExitCode(sleeper.process().Pid(), kExitCode); 167 VerifyWroteExitCode(sleeper.process().Pid(), kExitCode);
168 } 168 }
169 169
170 } // namespace browser_watcher 170 } // namespace browser_watcher
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698