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

Unified Diff: content/browser/gpu/gpu_blacklist_unittest.cc

Issue 10909221: Implement blacklist's force GPU capability in dual GPU machines. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
Index: content/browser/gpu/gpu_blacklist_unittest.cc
===================================================================
--- content/browser/gpu/gpu_blacklist_unittest.cc (revision 156326)
+++ content/browser/gpu/gpu_blacklist_unittest.cc (working copy)
@@ -1032,7 +1032,7 @@
GpuSwitchingOption switching = blacklist->MakeBlacklistDecision(
GpuBlacklist::kOsMacosx, &os_version,
gpu_info()).gpu_switching;
- EXPECT_EQ(switching, content::GPU_SWITCHING_FORCE_DISCRETE);
+ EXPECT_EQ(switching, content::GPU_SWITCHING_OPTION_FORCE_DISCRETE);
std::vector<uint32> entries;
bool disabled = false;
blacklist->GetDecisionEntries(entries, disabled);
@@ -1045,7 +1045,7 @@
switching = blacklist->MakeBlacklistDecision(
GpuBlacklist::kOsWin, &os_version,
gpu_info()).gpu_switching;
- EXPECT_EQ(switching, content::GPU_SWITCHING_FORCE_INTEGRATED);
+ EXPECT_EQ(switching, content::GPU_SWITCHING_OPTION_FORCE_INTEGRATED);
blacklist->GetDecisionEntries(entries, disabled);
EXPECT_EQ(entries.size(), 1u);
EXPECT_EQ(entries[0], 2u);
@@ -1056,7 +1056,7 @@
switching = blacklist->MakeBlacklistDecision(
GpuBlacklist::kOsLinux, &os_version,
gpu_info()).gpu_switching;
- EXPECT_EQ(switching, content::GPU_SWITCHING_AUTOMATIC);
+ EXPECT_EQ(switching, content::GPU_SWITCHING_OPTION_AUTOMATIC);
blacklist->GetDecisionEntries(entries, disabled);
EXPECT_EQ(entries.size(), 1u);
EXPECT_EQ(entries[0], 3u);

Powered by Google App Engine
This is Rietveld 408576698