Reland 130578 - Enable cookies per default in net. Add an API to disable them by default, and do th…

chrome/browser/chrome_browser_main_unittest.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/common/main_function_params.h"
 #include "net/socket/client_socket_pool_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class BrowserMainTest : public testing::Test {
  public:
-  BrowserMainTest() : command_line_(CommandLine::NO_PROGRAM) {}
+  BrowserMainTest()
+      : command_line_(CommandLine::NO_PROGRAM) {
+    ChromeBrowserMainParts::disable_enforcing_cookie_policies_for_tests_ = true;
+  }
 
  protected:
   TestingPrefService pref_service_;
   CommandLine command_line_;
 };
 
 TEST_F(BrowserMainTest, WarmConnectionFieldTrial_WarmestSocket) {
   command_line_.AppendSwitchASCII(switches::kSocketReusePolicy, "0");
 
   scoped_ptr<content::MainFunctionParams> params(
@@ skipping 47 matching lines @@
 #if defined(NDEBUG) && defined(DCHECK_ALWAYS_ON)
     EXPECT_DEATH(cbw->WarmConnectionFieldTrial(),
                  "Not a valid socket reuse policy group");
 #else
     EXPECT_DEBUG_DEATH(cbw->WarmConnectionFieldTrial(),
                        "Not a valid socket reuse policy group");
 #endif
   }
 }
 #endif