Enable GPU blacklist in tests.

content/public/common/content_switches.cc

Index: content/public/common/content_switches.cc
diff --git a/content/public/common/content_switches.cc b/content/public/common/content_switches.cc
index 25213153b31fd20322157d183e206643ec9dfa08..26133d239ec6fcac7f2476dba69dfed7ba9723ff 100644
--- a/content/public/common/content_switches.cc
+++ b/content/public/common/content_switches.cc
@@ -611,6 +611,9 @@ const char kJavaScriptFlags[]               = "js-flags";
 // Load an NPAPI plugin from the specified path.
 const char kLoadPlugin[]                    = "load-plugin";
 
+// Logs GPU blacklist decisions when enforcing blacklist rules.
+const char kLogGpuBlacklistDecisions[]        = "log-gpu-blacklist-decisions";

[Zhenyao Mo, 2013/08/27 22:50:41]

kLogGpuControlListDecisions and "log-gpu-control-list-decisions"

[gab, 2013/08/28 20:20:39]

Done.

+
 // Sets the minimum log level. Valid values are from 0 to 3:
 // INFO = 0, WARNING = 1, LOG_ERROR = 2, LOG_FATAL = 3.
 const char kLoggingLevel[]                  = "log-level";
@@ -758,12 +761,6 @@ const char kSingleProcess[]                 = "single-process";
 // http://crbug.com/159215.
 const char kSitePerProcess[]                = "site-per-process";
 
-// Skip gpu info collection, blacklist loading, and blacklist auto-update
-// scheduling at browser startup time.
-// Therefore, all GPU features are available, and about:gpu page shows empty
-// content. The switch is intended only for tests.
-const char kSkipGpuDataLoading[]            = "skip-gpu-data-loading";
-
 // Specifies the request key for the continuous speech recognition webservice.
 const char kSpeechRecognitionWebserviceKey[] = "speech-service-key";