OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <windows.h> | 5 #include <windows.h> |
6 #include <shlobj.h> | 6 #include <shlobj.h> |
| 7 #include <stddef.h> |
7 | 8 |
8 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
| 10 #include "base/macros.h" |
9 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
10 #include "base/strings/string_util.h" | 12 #include "base/strings/string_util.h" |
11 #include "base/win/registry.h" | 13 #include "base/win/registry.h" |
12 #include "chrome/installer/util/delete_after_reboot_helper.h" | 14 #include "chrome/installer/util/delete_after_reboot_helper.h" |
13 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
14 | 16 |
15 namespace { | 17 namespace { |
16 | 18 |
17 // These tests exercise the Delete-After-Reboot code which requires | 19 // These tests exercise the Delete-After-Reboot code which requires |
18 // modifications to HKLM. This will fail on Vista and above if the user | 20 // modifications to HKLM. This will fail on Vista and above if the user |
(...skipping 226 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
245 | 247 |
246 EXPECT_EQ(initial_pending_moves_size, pending_moves.size()); | 248 EXPECT_EQ(initial_pending_moves_size, pending_moves.size()); |
247 | 249 |
248 std::vector<PendingMove>::const_iterator check_iter(pending_moves.begin()); | 250 std::vector<PendingMove>::const_iterator check_iter(pending_moves.begin()); |
249 for (; check_iter != pending_moves.end(); ++check_iter) { | 251 for (; check_iter != pending_moves.end(); ++check_iter) { |
250 base::FilePath move_path(check_iter->first); | 252 base::FilePath move_path(check_iter->first); |
251 EXPECT_FALSE(MatchPendingDeletePath(short_temp_file, move_path)); | 253 EXPECT_FALSE(MatchPendingDeletePath(short_temp_file, move_path)); |
252 } | 254 } |
253 } | 255 } |
254 | 256 |
OLD | NEW |