Revert 243967 "Use a Finch Experiment to control the Browser Bla..."

> Use a Finch Experiment to control the Browser Blacklist > > Also increase the states stored in the register to prevent > the setup code from running multiple times per version if > it fails to start one time. > > BUG=329023 > > Review URL: https://codereview.chromium.org/120963002 TBR=csharp@chromium.org Review URL: https://codereview.chromium.org/132043005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@244026 0039d316-1c4b-4281-b951-d872f2087c98
cbchan · Jan 10, 2014 · 86ba1fe · 86ba1fe
1 parent 8261d96
commit 86ba1fe
Show file tree

Hide file tree

Showing 14 changed files with 44 additions and 382 deletions.
diff --git a/chrome/browser/DEPS b/chrome/browser/DEPS
@@ -3,7 +3,6 @@ include_rules = [
   "+ash",
   "+chrome/app",
   "+chrome/installer",
-  "+chrome_elf/blacklist",
   "+chromeos",
   "+components/autofill/content/browser",
   "+components/autofill/content/common",

diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
@@ -22,7 +22,6 @@
 #include "base/win/windows_version.h"
 #include "base/win/wrapped_window_proc.h"
 #include "chrome/browser/browser_util_win.h"
-#include "chrome/browser/chrome_elf_init_win.h"
 #include "chrome/browser/install_verification/win/install_verification.h"
 #include "chrome/browser/profiles/profile_info_cache.h"
 #include "chrome/browser/profiles/profile_shortcut_manager.h"
@@ -253,8 +252,6 @@ void ChromeBrowserMainPartsWin::PostBrowserStart() {
           FROM_HERE,
           base::Bind(&VerifyInstallation),
           base::TimeDelta::FromSeconds(45));
-
-  InitializeChromeElf();
 }
 
 // static

diff --git a/chrome/browser/chrome_elf_init_unittest_win.cc b/chrome/browser/chrome_elf_init_unittest_win.cc
diff --git a/chrome/browser/chrome_elf_init_win.cc b/chrome/browser/chrome_elf_init_win.cc
diff --git a/chrome/browser/chrome_elf_init_win.h b/chrome/browser/chrome_elf_init_win.h
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -418,8 +418,6 @@
         'browser/chrome_browser_main_win.h',
         'browser/chrome_content_browser_client.cc',
         'browser/chrome_content_browser_client.h',
-        'browser/chrome_elf_init_win.cc',
-        'browser/chrome_elf_init_win.h',
         'browser/chrome_notification_types.h',
         'browser/chrome_page_zoom.cc',
         'browser/chrome_page_zoom.h',
@@ -3317,7 +3315,6 @@
           'dependencies': [
             'chrome_process_finder',
             'installer_util_strings',
-            '../chrome_elf/chrome_elf.gyp:blacklist',
             '../google_update/google_update.gyp:google_update',
             '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
             '../third_party/isimpledom/isimpledom.gyp:isimpledom',

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
@@ -591,7 +591,6 @@
         'browser/captive_portal/testing_utils.cc',
         'browser/captive_portal/testing_utils.h',
         'browser/chrome_browser_application_mac_unittest.mm',
-        'browser/chrome_elf_init_unittest_win.cc',
         'browser/chrome_page_zoom_unittest.cc',
         'browser/chrome_process_singleton_win_unittest.cc',
         'browser/chromeos/accessibility/magnification_manager_unittest.cc',

diff --git a/chrome_elf/blacklist.gypi b/chrome_elf/blacklist.gypi
@@ -6,9 +6,6 @@
     {
       'target_name': 'blacklist',
       'type': 'static_library',
-      'include_dirs': [
-        '<(SHARED_INTERMEDIATE_DIR)',
-      ],
       'sources': [
         'blacklist/blacklist.cc',
         'blacklist/blacklist.h',
@@ -20,8 +17,7 @@
         # as that would risk pulling in base's link-time dependencies which
         # chrome_elf cannot do.
         '../base/base.gyp:base_static',
-        '../chrome/chrome.gyp:chrome_version_header',
-        '../sandbox/sandbox.gyp:sandbox',        
+        '../sandbox/sandbox.gyp:sandbox',
       ],
     },
     {