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

Unified Diff: chrome_frame/test/dll_redirector_loading_test.cc

Issue 10683005: Remove two deprecated methods from base::Version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: ... Created 8 years, 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome_frame/dll_redirector.cc ('k') | chrome_frame/test/dll_redirector_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome_frame/test/dll_redirector_loading_test.cc
diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc
index bba490fc2ae2480d140d3a3eb0e950b4da509161..9c46425153715c4cd8bd1634efba30c1b3019a26 100644
--- a/chrome_frame/test/dll_redirector_loading_test.cc
+++ b/chrome_frame/test/dll_redirector_loading_test.cc
@@ -45,9 +45,9 @@ class DllRedirectorLoadingTest : public testing::Test {
scoped_ptr<FileVersionInfo> original_version_info(
FileVersionInfo::CreateFileVersionInfo(build_chrome_frame_dll));
ASSERT_TRUE(original_version_info != NULL);
- original_version_.reset(Version::GetVersionFromString(
- WideToASCII(original_version_info->file_version())));
- ASSERT_TRUE(original_version_ != NULL);
+ original_version_.reset(
+ new Version(WideToASCII(original_version_info->file_version())));
+ ASSERT_TRUE(original_version_->IsValid());
// Make a place for us to run the test from.
ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
@@ -80,9 +80,9 @@ class DllRedirectorLoadingTest : public testing::Test {
scoped_ptr<FileVersionInfo> new_version_info(
FileVersionInfo::CreateFileVersionInfo(temporary_new_chrome_frame_dll));
ASSERT_TRUE(new_version_info != NULL);
- new_version_.reset(Version::GetVersionFromString(
- WideToASCII(new_version_info->file_version())));
- ASSERT_TRUE(new_version_ != NULL);
+ new_version_.reset(
+ new Version(WideToASCII(new_version_info->file_version())));
+ ASSERT_TRUE(new_version_->IsValid());
// Make sure the new version is larger than the old.
ASSERT_EQ(new_version_->CompareTo(*original_version_.get()), 1);
@@ -208,10 +208,10 @@ TEST_F(DllRedirectorLoadingTest, MAYBE_TestDllRedirection) {
char buffer[kSharedMemoryBytes] = {0};
memcpy(buffer, beacon.memory(), kSharedMemoryBytes - 1);
- scoped_ptr<Version> beacon_version(Version::GetVersionFromString(buffer));
- ASSERT_TRUE(beacon_version != NULL);
+ Version beacon_version(buffer);
+ ASSERT_TRUE(beacon_version.IsValid());
EXPECT_EQ(0,
- beacon_version->CompareTo(*test_data[i].expected_beacon_version));
+ beacon_version.CompareTo(*test_data[i].expected_beacon_version));
}
}
« no previous file with comments | « chrome_frame/dll_redirector.cc ('k') | chrome_frame/test/dll_redirector_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698