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

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

Issue 18332014: Move Copy* into the base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: windows 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
« no previous file with comments | « chrome/test/perf/perf_ui_test_suite.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 54
55 // Make a versioned dir for the original chrome frame dll to run under. 55 // Make a versioned dir for the original chrome frame dll to run under.
56 base::FilePath original_version_dir( 56 base::FilePath original_version_dir(
57 temp_dir_.path().AppendASCII(original_version_->GetString())); 57 temp_dir_.path().AppendASCII(original_version_->GetString()));
58 ASSERT_TRUE(file_util::CreateDirectory(original_version_dir)); 58 ASSERT_TRUE(file_util::CreateDirectory(original_version_dir));
59 59
60 // Now move the original DLL that we will operate on into a named-version 60 // Now move the original DLL that we will operate on into a named-version
61 // folder. 61 // folder.
62 original_chrome_frame_dll_ = 62 original_chrome_frame_dll_ =
63 original_version_dir.Append(build_chrome_frame_dll.BaseName()); 63 original_version_dir.Append(build_chrome_frame_dll.BaseName());
64 ASSERT_TRUE(file_util::CopyFile(build_chrome_frame_dll, 64 ASSERT_TRUE(base::CopyFile(build_chrome_frame_dll,
65 original_chrome_frame_dll_)); 65 original_chrome_frame_dll_));
66 ASSERT_TRUE(file_util::PathExists(original_chrome_frame_dll_)); 66 ASSERT_TRUE(file_util::PathExists(original_chrome_frame_dll_));
67 67
68 // Temporary location for the new Chrome Frame DLL. 68 // Temporary location for the new Chrome Frame DLL.
69 base::FilePath temporary_new_chrome_frame_dll( 69 base::FilePath temporary_new_chrome_frame_dll(
70 temp_dir_.path().Append(build_chrome_frame_dll.BaseName())); 70 temp_dir_.path().Append(build_chrome_frame_dll.BaseName()));
71 71
72 // Generate the version-bumped Chrome Frame DLL to a temporary path. 72 // Generate the version-bumped Chrome Frame DLL to a temporary path.
73 ASSERT_TRUE( 73 ASSERT_TRUE(
74 upgrade_test::GenerateAlternatePEFileVersion( 74 upgrade_test::GenerateAlternatePEFileVersion(
75 original_chrome_frame_dll_, 75 original_chrome_frame_dll_,
(...skipping 132 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/test/perf/perf_ui_test_suite.cc ('k') | chrome_frame/test/test_with_web_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698