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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 8670004: Move GPU preliminary info collection back to UI thread. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month 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 | « content/browser/gpu/gpu_blacklist.cc ('k') | content/gpu/gpu_info_collector_linux.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/browser/gpu/gpu_blacklist_unittest.cc
===================================================================
--- content/browser/gpu/gpu_blacklist_unittest.cc (revision 111230)
+++ content/browser/gpu/gpu_blacklist_unittest.cc (working copy)
@@ -59,14 +59,14 @@
ASSERT_EQ(file_util::ReadFile(data_file, data.get(), data_file_size),
data_file_size);
std::string json_string(data.get(), data_file_size);
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(blacklist.LoadGpuBlacklist(json_string, GpuBlacklist::kAllOs));
EXPECT_FALSE(blacklist.contains_unknown_fields());
}
TEST_F(GpuBlacklistTest, DefaultBlacklistSettings) {
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
// Default blacklist settings: all feature are allowed.
GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
GpuBlacklist::kOsMacosx, os_version.get(), gpu_info());
@@ -83,7 +83,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(empty_list_json, GpuBlacklist::kAllOs));
@@ -125,7 +125,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(exact_list_json, GpuBlacklist::kAllOs));
@@ -174,7 +174,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
// Blacklist entries won't be filtered to the current OS only upon loading.
EXPECT_TRUE(blacklist.LoadGpuBlacklist(vendor_json, GpuBlacklist::kAllOs));
@@ -230,7 +230,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(vendor_linux_json, GpuBlacklist::kAllOs));
@@ -271,7 +271,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(blacklist.LoadGpuBlacklist(linux_except_nvidia_json,
GpuBlacklist::kAllOs));
@@ -310,7 +310,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(blacklist.LoadGpuBlacklist(linux_except_intel_json,
GpuBlacklist::kAllOs));
@@ -350,7 +350,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(date_windows_json, GpuBlacklist::kAllOs));
@@ -384,7 +384,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(blacklist.LoadGpuBlacklist(devices_json, GpuBlacklist::kAllOs));
GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
@@ -419,7 +419,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(blacklist.LoadGpuBlacklist(devices_json, GpuBlacklist::kAllOs));
GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
@@ -451,14 +451,14 @@
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist9("9.0 unknown");
+ GpuBlacklist blacklist9("9.0");
EXPECT_TRUE(
blacklist9.LoadGpuBlacklist(browser_version_json, GpuBlacklist::kAllOs));
GpuFeatureFlags flags = blacklist9.DetermineGpuFeatureFlags(
GpuBlacklist::kOsWin, os_version.get(), gpu_info());
EXPECT_EQ(flags.flags(), 0u);
- GpuBlacklist blacklist10("10.0 unknown");
+ GpuBlacklist blacklist10("10.0");
EXPECT_TRUE(
blacklist10.LoadGpuBlacklist(browser_version_json, GpuBlacklist::kAllOs));
flags = blacklist10.DetermineGpuFeatureFlags(
@@ -483,7 +483,7 @@
" }\n"
" ]\n"
"}";
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_FALSE(
blacklist.LoadGpuBlacklist(malformed_vendor_json, GpuBlacklist::kAllOs));
@@ -511,7 +511,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(unknown_field_json, GpuBlacklist::kAllOs));
@@ -556,7 +556,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(blacklist.LoadGpuBlacklist(unknown_exception_field_json,
GpuBlacklist::kAllOs));
@@ -584,7 +584,7 @@
" ]\n"
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(unknown_feature_json, GpuBlacklist::kAllOs));
@@ -596,80 +596,6 @@
static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
}
-TEST_F(GpuBlacklistTest, BrowserChannels) {
- const std::string browser_channels_json =
- "{\n"
- " \"name\": \"gpu blacklist\",\n"
- " \"version\": \"0.1\",\n"
- " \"entries\": [\n"
- " {\n"
- " \"id\": 1,\n"
- " \"browser_channels\": [\n"
- " \"canary\""
- " ],\n"
- " \"blacklist\": [\n"
- " \"webgl\"\n"
- " ]\n"
- " }\n"
- " ]\n"
- "}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
-
- GpuBlacklist blacklist_canary("1.0 canary");
- EXPECT_TRUE(blacklist_canary.LoadGpuBlacklist(browser_channels_json,
- GpuBlacklist::kAllOs));
- GpuFeatureFlags flags_canary = blacklist_canary.DetermineGpuFeatureFlags(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
- EXPECT_EQ(flags_canary.flags(),
- static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
-
- GpuBlacklist blacklist_dev("1.0 dev");
- EXPECT_TRUE(blacklist_dev.LoadGpuBlacklist(browser_channels_json,
- GpuBlacklist::kAllOs));
- GpuFeatureFlags flags_dev = blacklist_dev.DetermineGpuFeatureFlags(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
- EXPECT_EQ(flags_dev.flags(), 0u);
-}
-
-TEST_F(GpuBlacklistTest, BrowserChannelsInException) {
- const std::string browser_channels_json =
- "{\n"
- " \"name\": \"gpu blacklist\",\n"
- " \"version\": \"0.1\",\n"
- " \"entries\": [\n"
- " {\n"
- " \"id\": 1,\n"
- " \"exceptions\": [\n"
- " {\n"
- " \"browser_channels\": [\n"
- " \"canary\""
- " ]\n"
- " }\n"
- " ],\n"
- " \"blacklist\": [\n"
- " \"webgl\"\n"
- " ]\n"
- " }\n"
- " ]\n"
- "}";
- scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
-
- GpuBlacklist blacklist_canary("1.0 canary");
- EXPECT_TRUE(blacklist_canary.LoadGpuBlacklist(browser_channels_json,
- GpuBlacklist::kAllOs));
- GpuFeatureFlags flags_canary = blacklist_canary.DetermineGpuFeatureFlags(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
- EXPECT_EQ(flags_canary.flags(), 0u);
-
- GpuBlacklist blacklist_dev("1.0 dev");
- EXPECT_TRUE(blacklist_dev.LoadGpuBlacklist(browser_channels_json,
- GpuBlacklist::kAllOs));
- GpuFeatureFlags flags_dev = blacklist_dev.DetermineGpuFeatureFlags(
- GpuBlacklist::kOsWin, os_version.get(), gpu_info());
- EXPECT_EQ(flags_dev.flags(),
- static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl));
-}
-
TEST_F(GpuBlacklistTest, GlVendor) {
const std::string gl_vendor_json =
"{\n"
@@ -690,7 +616,7 @@
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(gl_vendor_json, GpuBlacklist::kAllOs));
GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
@@ -719,7 +645,7 @@
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(gl_renderer_json, GpuBlacklist::kAllOs));
GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
@@ -745,7 +671,7 @@
"}";
scoped_ptr<Version> os_version(Version::GetVersionFromString("10.6.4"));
- GpuBlacklist blacklist("1.0 unknown");
+ GpuBlacklist blacklist("1.0");
EXPECT_TRUE(
blacklist.LoadGpuBlacklist(disabled_json, GpuBlacklist::kAllOs));
GpuFeatureFlags flags = blacklist.DetermineGpuFeatureFlags(
« no previous file with comments | « content/browser/gpu/gpu_blacklist.cc ('k') | content/gpu/gpu_info_collector_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698