Cleanup: Remove an unused variable in chrome_browser_main.cc.

Also remove references to deleted BrowserMainTest.

BUG=139429

Review URL: https://codereview.chromium.org/891883002

Cr-Commit-Position: refs/heads/master@{#314366}

build/android/pylib/gtest/filter/unit_tests_disabled

 # List of suppressions
 
-# crbug.com/139429
-BrowserMainTest.WarmConnectionFieldTrial_Invalid
-BrowserMainTest.WarmConnectionFieldTrial_Random
-BrowserMainTest.WarmConnectionFieldTrial_WarmestSocket
-
 # The UDP related tests currently do not work on Android because
 # we lack a UDP forwarder tool.
 NetworkStatsTestUDP.*

chrome/browser/chrome_browser_main.cc

@@ -553,10 +553,6 @@ const char kMissingLocaleDataMessage[] =
 
 // BrowserMainParts ------------------------------------------------------------
 
-// static
-bool ChromeBrowserMainParts::disable_enforcing_cookie_policies_for_tests_ =
-    false;
-
 ChromeBrowserMainParts::ChromeBrowserMainParts(
     const content::MainFunctionParams& parameters)
     : parameters_(parameters),
@@ -577,8 +573,7 @@ ChromeBrowserMainParts::ChromeBrowserMainParts(
   // Chrome disallows cookies by default. All code paths that want to use
   // cookies need to go through one of Chrome's URLRequestContexts which have
   // a ChromeNetworkDelegate attached that selectively allows cookies again.
-  if (!disable_enforcing_cookie_policies_for_tests_)
-    net::URLRequest::SetDefaultCookiePolicyToBlock();
+  net::URLRequest::SetDefaultCookiePolicyToBlock();
 }
 
 ChromeBrowserMainParts::~ChromeBrowserMainParts() {

chrome/browser/chrome_browser_main.h

@@ -185,10 +185,6 @@ class ChromeBrowserMainParts : public content::BrowserMainParts {
   // Members needed across shutdown methods.
   bool restart_last_session_;
 
-  // Tests can set this to true to disable restricting cookie access in the
-  // network stack, as this can only be done once.
-  static bool disable_enforcing_cookie_policies_for_tests_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainParts);
 };