BASELINE: Update Chromium to 49.0.2623.34

Change-Id: I89af6c0074347d4415cc1ce35a6d54a3760e6ad2
Reviewed-by: Michael Brüning <michael.bruning@theqtcompany.com>

1 files changed, 0 insertions, 27 deletions

diff --git a/chromium/content/common/content_switches_internal.cc b/chromium/content/common/content_switches_internal.cc
index d18540f88cc..f496c504f59 100644
--- a/chromium/content/common/content_switches_internal.cc
+++ b/chromium/content/common/content_switches_internal.cc
@@ -12,7 +12,6 @@
 #include "content/public/common/content_switches.h"
 
 #if defined(OS_WIN)
-#include "base/strings/string_tokenizer.h"
 #include "base/win/windows_version.h"
 #include "ui/gfx/win/direct_write.h"
 #endif
@@ -64,32 +63,6 @@ bool IsWin32kRendererLockdownEnabled() {
   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 =
-      base::FieldTrialList::FindFullName("EnableWin32kLockDownMimeTypes");
-  if (cmd_line->HasSwitch(switches::kEnableWin32kLockDownMimeTypes)) {
-    mime_types =
-        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)
-      return true;
-  }
-
-  return false;
-}
 #endif
 
 V8CacheOptions GetV8CacheOptions() {