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

Side by Side Diff: chrome_frame/test/dll_redirector_loading_test.cc

Issue 18383003: Move DeleteAfterReboot and Move to base namespace (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 5 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 // A test that exercises Chrome Frame's DLL Redirctor update code. This test 5 // A test that exercises Chrome Frame's DLL Redirctor update code. This test
6 // generates a new version of CF from the one already in the build folder and 6 // generates a new version of CF from the one already in the build folder and
7 // then loads them both into the current process to verify the handoff. 7 // then loads them both into the current process to verify the handoff.
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/file_version_info.h" 10 #include "base/file_version_info.h"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
86 86
87 // Make sure the new version is larger than the old. 87 // Make sure the new version is larger than the old.
88 ASSERT_EQ(new_version_->CompareTo(*original_version_.get()), 1); 88 ASSERT_EQ(new_version_->CompareTo(*original_version_.get()), 1);
89 89
90 // Now move the new Chrome Frame dll to its final resting place: 90 // Now move the new Chrome Frame dll to its final resting place:
91 base::FilePath new_version_dir( 91 base::FilePath new_version_dir(
92 temp_dir_.path().AppendASCII(new_version_->GetString())); 92 temp_dir_.path().AppendASCII(new_version_->GetString()));
93 ASSERT_TRUE(file_util::CreateDirectory(new_version_dir)); 93 ASSERT_TRUE(file_util::CreateDirectory(new_version_dir));
94 new_chrome_frame_dll_ = 94 new_chrome_frame_dll_ =
95 new_version_dir.Append(build_chrome_frame_dll.BaseName()); 95 new_version_dir.Append(build_chrome_frame_dll.BaseName());
96 ASSERT_TRUE(file_util::Move(temporary_new_chrome_frame_dll, 96 ASSERT_TRUE(base::Move(temporary_new_chrome_frame_dll,
97 new_chrome_frame_dll_)); 97 new_chrome_frame_dll_));
98 ASSERT_TRUE(file_util::PathExists(new_chrome_frame_dll_)); 98 ASSERT_TRUE(file_util::PathExists(new_chrome_frame_dll_));
99 } 99 }
100 100
101 static void TearDownTestCase() { 101 static void TearDownTestCase() {
102 if (!temp_dir_.Delete()) { 102 if (!temp_dir_.Delete()) {
103 // The temp_dir cleanup has been observed to fail in some cases. It looks 103 // The temp_dir cleanup has been observed to fail in some cases. It looks
104 // like something is holding on to the Chrome Frame DLLs after they have 104 // like something is holding on to the Chrome Frame DLLs after they have
105 // been explicitly unloaded. At least schedule them for cleanup on reboot. 105 // been explicitly unloaded. At least schedule them for cleanup on reboot.
106 ScheduleDirectoryForDeletion(temp_dir_.path().value().c_str()); 106 ScheduleDirectoryForDeletion(temp_dir_.path().value().c_str());
107 } 107 }
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 208
209 char buffer[kSharedMemoryBytes] = {0}; 209 char buffer[kSharedMemoryBytes] = {0};
210 memcpy(buffer, beacon.memory(), kSharedMemoryBytes - 1); 210 memcpy(buffer, beacon.memory(), kSharedMemoryBytes - 1);
211 Version beacon_version(buffer); 211 Version beacon_version(buffer);
212 ASSERT_TRUE(beacon_version.IsValid()); 212 ASSERT_TRUE(beacon_version.IsValid());
213 213
214 EXPECT_EQ(0, 214 EXPECT_EQ(0,
215 beacon_version.CompareTo(*test_data[i].expected_beacon_version)); 215 beacon_version.CompareTo(*test_data[i].expected_beacon_version));
216 } 216 }
217 } 217 }
OLDNEW
« no previous file with comments | « chrome/tools/crash_service/crash_service.cc ('k') | chrome_frame/test/reliability/page_load_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698