Added PPAPI win32k lockdown options to chrome://flags.

content/common/content_switches_internal.cc

 // Copyright (c) 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/common/content_switches_internal.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/metrics/field_trial.h"
@@ skipping 52 matching lines @@
   return true;
 }
 
 bool IsWin32kLockdownEnabledForMimeType(const std::string& mime_type) {
   // Consider PPAPI lockdown a superset of renderer lockdown.
   if (!IsWin32kRendererLockdownEnabled())
     return false;
   const base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
 
   std::string mime_types =
-      cmd_line->GetSwitchValueASCII(switches::kEnableWin32kLockDownMimeTypes);
-
-  if (mime_types.empty()) {
+      base::FieldTrialList::FindFullName("EnableWin32kLockDownMimeTypes");
+  if (cmd_line->HasSwitch(switches::kEnableWin32kLockDownMimeTypes)) {
     mime_types =
-        base::FieldTrialList::FindFullName("EnableWin32kLockDownMimeTypes");
+        cmd_line->GetSwitchValueASCII(switches::kEnableWin32kLockDownMimeTypes);
   }
 
   // Consider the value * to enable all mime types for lockdown.
   if (mime_types == "*")
     return true;
 
   base::StringTokenizer tokenizer(mime_types, ",");
   tokenizer.set_quote_chars("\"");
   while (tokenizer.GetNext()) {
     if (tokenizer.token() == mime_type)
@@ skipping 16 matching lines @@
   } else if (v8_cache_options == "parse") {
     return V8_CACHE_OPTIONS_PARSE;
   } else if (v8_cache_options == "code") {
     return V8_CACHE_OPTIONS_CODE;
   } else {
     return V8_CACHE_OPTIONS_DEFAULT;
   }
 }
 
 } // namespace content