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

Side by Side Diff: chrome/installer/util/delete_after_reboot_helper_unittest.cc

Issue 497083004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/, part 2. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@file_util
Patch Set: Created 6 years, 4 months 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) 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 7
8 #include "base/file_util.h" 8 #include "base/files/file_util.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
11 #include "base/win/registry.h" 11 #include "base/win/registry.h"
12 #include "chrome/installer/util/delete_after_reboot_helper.h" 12 #include "chrome/installer/util/delete_after_reboot_helper.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 namespace { 15 namespace {
16 16
17 // These tests exercise the Delete-After-Reboot code which requires 17 // These tests exercise the Delete-After-Reboot code which requires
18 // modifications to HKLM. This will fail on Vista and above if the user 18 // modifications to HKLM. This will fail on Vista and above if the user
(...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 243
244 EXPECT_EQ(initial_pending_moves_size, pending_moves.size()); 244 EXPECT_EQ(initial_pending_moves_size, pending_moves.size());
245 245
246 std::vector<PendingMove>::const_iterator check_iter(pending_moves.begin()); 246 std::vector<PendingMove>::const_iterator check_iter(pending_moves.begin());
247 for (; check_iter != pending_moves.end(); ++check_iter) { 247 for (; check_iter != pending_moves.end(); ++check_iter) {
248 base::FilePath move_path(check_iter->first); 248 base::FilePath move_path(check_iter->first);
249 EXPECT_FALSE(MatchPendingDeletePath(short_temp_file, move_path)); 249 EXPECT_FALSE(MatchPendingDeletePath(short_temp_file, move_path));
250 } 250 }
251 } 251 }
252 252
OLDNEW
« no previous file with comments | « chrome/installer/util/delete_after_reboot_helper.cc ('k') | chrome/installer/util/delete_tree_work_item.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698