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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/gpu_blacklist_unittest.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/browser/gpu_blacklist.cc ('k') | chrome/browser/gpu_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gpu_blacklist_unittest.cc
diff --git a/chrome/browser/gpu_blacklist_unittest.cc b/chrome/browser/gpu_blacklist_unittest.cc
index c97d88f626fe33e7839fd1ace1c6a678c2a502c2..85af17a5ba2da1379892d92a8731c486f7b3885f 100644
--- a/chrome/browser/gpu_blacklist_unittest.cc
+++ b/chrome/browser/gpu_blacklist_unittest.cc
@@ -76,11 +76,11 @@ TEST_F(GpuBlacklistTest, CurrentBlacklistValidation) {
}
TEST_F(GpuBlacklistTest, DefaultBlacklistSettings) {
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
// Default blacklist settings: all feature are allowed.
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, 0);
}
@@ -93,14 +93,14 @@ TEST_F(GpuBlacklistTest, EmptyBlacklist) {
" \"entries\": [\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
empty_list_json, GpuBlacklist::kAllOs));
EXPECT_EQ(blacklist->GetVersion(), std::string("2.5"));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, 0);
}
@@ -132,13 +132,13 @@ TEST_F(GpuBlacklistTest, DetailedEntryAndInvalidJson) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
exact_list_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING);
// Invalid json input should not change the current blacklist settings.
@@ -147,7 +147,7 @@ TEST_F(GpuBlacklistTest, DetailedEntryAndInvalidJson) {
EXPECT_FALSE(blacklist->LoadGpuBlacklist(
invalid_json, GpuBlacklist::kAllOs));
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_COMPOSITING);
std::vector<uint32> entries;
bool disabled = false;
@@ -178,20 +178,20 @@ TEST_F(GpuBlacklistTest, VendorOnAllOsEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
// Blacklist entries won't be filtered to the current OS only upon loading.
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
vendor_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
#if defined(OS_WIN) || defined(OS_LINUX) || defined(OS_MACOSX) || \
defined(OS_OPENBSD)
@@ -199,13 +199,13 @@ TEST_F(GpuBlacklistTest, VendorOnAllOsEntry) {
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
vendor_json, GpuBlacklist::kCurrentOsOnly));
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
#endif
}
@@ -229,19 +229,19 @@ TEST_F(GpuBlacklistTest, VendorOnLinuxEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
vendor_linux_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS);
}
@@ -268,19 +268,19 @@ TEST_F(GpuBlacklistTest, AllExceptNVidiaOnLinuxEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
linux_except_nvidia_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, 0);
}
@@ -307,19 +307,19 @@ TEST_F(GpuBlacklistTest, AllExceptIntelOnLinuxEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
linux_except_intel_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS);
}
@@ -345,19 +345,19 @@ TEST_F(GpuBlacklistTest, DateOnWindowsEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
date_windows_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, 0);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_ACCELERATED_2D_CANVAS);
}
@@ -377,19 +377,19 @@ TEST_F(GpuBlacklistTest, MultipleDevicesEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
devices_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_MULTISAMPLING);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_MULTISAMPLING);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_MULTISAMPLING);
}
@@ -410,16 +410,16 @@ TEST_F(GpuBlacklistTest, ChromeOSEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
devices_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsChromeOS, os_version.get(), gpu_info());
+ GpuBlacklist::kOsChromeOS, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info());
+ GpuBlacklist::kOsLinux, &os_version, gpu_info());
EXPECT_EQ(type, 0);
}
@@ -441,20 +441,20 @@ TEST_F(GpuBlacklistTest, ChromeVersionEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist9(Create());
EXPECT_TRUE(blacklist9->LoadGpuBlacklist(
"9.0", browser_version_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist9->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, 0);
scoped_ptr<GpuBlacklist> blacklist10(Create());
EXPECT_TRUE(blacklist10->LoadGpuBlacklist(
"10.0", browser_version_json, GpuBlacklist::kAllOs));
type = blacklist10->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -501,7 +501,7 @@ TEST_F(GpuBlacklistTest, UnknownField) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
@@ -509,7 +509,7 @@ TEST_F(GpuBlacklistTest, UnknownField) {
EXPECT_EQ(1u, blacklist->num_entries());
EXPECT_TRUE(blacklist->contains_unknown_fields());
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -545,7 +545,7 @@ TEST_F(GpuBlacklistTest, UnknownExceptionField) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
@@ -553,7 +553,7 @@ TEST_F(GpuBlacklistTest, UnknownExceptionField) {
EXPECT_EQ(1u, blacklist->num_entries());
EXPECT_TRUE(blacklist->contains_unknown_fields());
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -572,7 +572,7 @@ TEST_F(GpuBlacklistTest, UnknownFeature) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
@@ -580,7 +580,7 @@ TEST_F(GpuBlacklistTest, UnknownFeature) {
EXPECT_EQ(1u, blacklist->num_entries());
EXPECT_TRUE(blacklist->contains_unknown_fields());
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -602,13 +602,13 @@ TEST_F(GpuBlacklistTest, GlVendor) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
gl_vendor_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -630,13 +630,13 @@ TEST_F(GpuBlacklistTest, GlRenderer) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
gl_renderer_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -658,12 +658,12 @@ TEST_F(GpuBlacklistTest, PerfGraphics) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -685,12 +685,12 @@ TEST_F(GpuBlacklistTest, PerfGaming) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, 0);
}
@@ -713,12 +713,12 @@ TEST_F(GpuBlacklistTest, PerfOverall) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -737,13 +737,13 @@ TEST_F(GpuBlacklistTest, DisabledEntry) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
scoped_ptr<GpuBlacklist> blacklist(Create());
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
disabled_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
+ GpuBlacklist::kOsWin, &os_version, gpu_info());
EXPECT_EQ(type, 0);
std::vector<uint32> flag_entries;
bool disabled = false;
@@ -774,7 +774,7 @@ TEST_F(GpuBlacklistTest, Optimus) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
content::GPUInfo gpu_info;
gpu_info.optimus = true;
@@ -783,7 +783,7 @@ TEST_F(GpuBlacklistTest, Optimus) {
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
optimus_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info);
+ GpuBlacklist::kOsLinux, &os_version, gpu_info);
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -805,7 +805,7 @@ TEST_F(GpuBlacklistTest, AMDSwitchable) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
content::GPUInfo gpu_info;
gpu_info.amd_switchable = true;
@@ -814,7 +814,7 @@ TEST_F(GpuBlacklistTest, AMDSwitchable) {
EXPECT_TRUE(blacklist->LoadGpuBlacklist(
amd_switchable_json, GpuBlacklist::kAllOs));
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsMacosx, os_version.get(), gpu_info);
+ GpuBlacklist::kOsMacosx, &os_version, gpu_info);
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
}
@@ -841,7 +841,7 @@ TEST_F(GpuBlacklistTest, LexicalDriverVersion) {
" }\n"
" ]\n"
"}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
+ Version os_version("10.6.4");
content::GPUInfo gpu_info;
gpu_info.gpu.vendor_id = 0x1002;
@@ -852,22 +852,21 @@ TEST_F(GpuBlacklistTest, LexicalDriverVersion) {
gpu_info.driver_version = "8.109";
GpuFeatureType type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info);
+ GpuBlacklist::kOsLinux, &os_version, gpu_info);
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
gpu_info.driver_version = "8.2";
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info);
+ GpuBlacklist::kOsLinux, &os_version, gpu_info);
EXPECT_EQ(type, content::GPU_FEATURE_TYPE_WEBGL);
gpu_info.driver_version = "8.21";
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info);
+ GpuBlacklist::kOsLinux, &os_version, gpu_info);
EXPECT_EQ(type, 0);
gpu_info.driver_version = "8.2010";
type = blacklist->DetermineGpuFeatureType(
- GpuBlacklist::kOsLinux, os_version.get(), gpu_info);
+ GpuBlacklist::kOsLinux, &os_version, gpu_info);
EXPECT_EQ(type, 0);
}
-
« no previous file with comments | « chrome/browser/gpu_blacklist.cc ('k') | chrome/browser/gpu_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698