Merge 275859 "Add "One Key Theater" DLLs to the browser DLL blac..."

chrome_elf/blacklist/blacklist.cc

 // Copyright 2013 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 "chrome_elf/blacklist/blacklist.h"
 
 #include <assert.h>
 #include <string.h>
 
 #include <vector>
@@ skipping 10 matching lines @@
 // http://blogs.msdn.com/oldnewthing/archive/2004/10/25/247180.aspx
 extern "C" IMAGE_DOS_HEADER __ImageBase;
 
 namespace blacklist{
 
 const wchar_t* g_troublesome_dlls[kTroublesomeDllsMaxCount] = {
   L"datamngr.dll",                      // Unknown (suspected adware).
   L"hk.dll",                            // Unknown (keystroke logger).
   L"libsvn_tsvn32.dll",                 // TortoiseSVN.
   L"lmrn.dll",                          // Unknown.
+  L"activedetect32.dll",                // Lenovo One Key Theater.
+                                        // See crbug.com/379218.
+  L"windowsapihookdll32.dll",           // Lenovo One Key Theater.
+  L"activedetect64.dll",                // Lenovo One Key Theater.
+  L"windowsapihookdll64.dll",           // Lenovo One Key Theater.
   // Keep this null pointer here to mark the end of the list.
   NULL,
 };
 
 bool g_blocked_dlls[kTroublesomeDllsMaxCount] = {};
 int g_num_blocked_dlls = 0;
 
 }  // namespace blacklist
 
 // Allocate storage for thunks in a page of this module to save on doing
@@ skipping 342 matching lines @@
   }
 
   // Delete the finch registry key to clear the values.
   result = ::RegDeleteKey(key, L"");
 
   ::RegCloseKey(key);
   return result == ERROR_SUCCESS;
 }
 
 }  // namespace blacklist