Do cookie checks in NetworkDelegate instead of the URLRequest::Delegate.

chrome/browser/extensions/api/webrequest/webrequest_api_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 <queue>
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/json/json_string_value_serializer.h"
 #include "base/memory/weak_ptr.h"
+#include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
+#include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/extensions/api/webrequest/webrequest_api.h"
 #include "chrome/browser/extensions/api/webrequest/webrequest_api_constants.h"
 #include "chrome/browser/extensions/api/webrequest/webrequest_api_helpers.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/net/chrome_network_delegate.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "chrome/test/base/testing_profile.h"
+#include "content/test/test_browser_thread.h"
 #include "net/base/auth.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace helpers = extension_webrequest_api_helpers;
 namespace keys = extension_webrequest_api_constants;
 
 namespace {
 static void EventHandledOnIOThread(
@@ skipping 51 matching lines @@
 
     sent_messages_.push_back(linked_ptr<IPC::Message>(message));
     return true;
   }
 
   std::queue<base::Closure> task_queue_;
   SentMessages sent_messages_;
 };
 
 class ExtensionWebRequestTest : public testing::Test {
+ public:
+  ExtensionWebRequestTest()
+      : ui_thread_(content::BrowserThread::UI, &message_loop_),
+        io_thread_(content::BrowserThread::IO, &message_loop_) {}
+
  protected:
-  virtual void SetUp() {
+  virtual void SetUp() OVERRIDE {
     event_router_ = new ExtensionEventRouterForwarder();
     enable_referrers_.Init(
         prefs::kEnableReferrers, profile_.GetTestingPrefService(), NULL);
     network_delegate_.reset(new ChromeNetworkDelegate(
-        event_router_.get(), NULL, NULL, &profile_, &enable_referrers_));
+        event_router_.get(), NULL, NULL, &profile_,
+        CookieSettings::Factory::GetForProfile(&profile_), &enable_referrers_));
     context_ = new TestURLRequestContext();
     context_->set_network_delegate(network_delegate_.get());
   }
 
-  MessageLoopForIO io_loop_;
+  MessageLoopForIO message_loop_;
+  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread io_thread_;
   TestingProfile profile_;
   TestDelegate delegate_;
   BooleanPrefMember enable_referrers_;
   TestIPCSender ipc_sender_;
   scoped_refptr<ExtensionEventRouterForwarder> event_router_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
   scoped_ptr<ChromeNetworkDelegate> network_delegate_;
   scoped_refptr<TestURLRequestContext> context_;
 };
 
@@ skipping 277 matching lines @@
   int before_size;
   HeaderModificationTest_Header before[10];
   int modification_size;
   HeaderModificationTest_Modification modification[10];
   int after_size;
   HeaderModificationTest_Header after[10];
 };
 
 class ExtensionWebRequestHeaderModificationTest :
     public testing::TestWithParam<HeaderModificationTest> {
+ public:
+  ExtensionWebRequestHeaderModificationTest()
+      : ui_thread_(content::BrowserThread::UI, &message_loop_),
+        io_thread_(content::BrowserThread::IO, &message_loop_) {}
+
  protected:
   virtual void SetUp() {
     event_router_ = new ExtensionEventRouterForwarder();
     enable_referrers_.Init(
         prefs::kEnableReferrers, profile_.GetTestingPrefService(), NULL);
     network_delegate_.reset(new ChromeNetworkDelegate(
-        event_router_.get(), NULL, NULL, &profile_, &enable_referrers_));
+        event_router_.get(), NULL, NULL, &profile_,
+        CookieSettings::Factory::GetForProfile(&profile_), &enable_referrers_));
     context_ = new TestURLRequestContext();
     context_->set_network_delegate(network_delegate_.get());
   }
 
-  MessageLoopForIO io_loop_;
+  MessageLoopForIO message_loop_;
+  content::TestBrowserThread ui_thread_;
+  content::TestBrowserThread io_thread_;
   TestingProfile profile_;
   TestDelegate delegate_;
   BooleanPrefMember enable_referrers_;
   TestIPCSender ipc_sender_;
   scoped_refptr<ExtensionEventRouterForwarder> event_router_;
   scoped_refptr<ExtensionInfoMap> extension_info_map_;
   scoped_ptr<ChromeNetworkDelegate> network_delegate_;
   scoped_refptr<TestURLRequestContext> context_;
 };
 
@@ skipping 984 matching lines @@
   credentials_set = MergeOnAuthRequiredResponses(
         deltas, &auth3, &conflicting_extensions, &event_log);
   EXPECT_TRUE(credentials_set);
   EXPECT_FALSE(auth3.Empty());
   EXPECT_EQ(username, auth1.username());
   EXPECT_EQ(password, auth1.password());
   EXPECT_EQ(1u, conflicting_extensions.size());
   EXPECT_TRUE(ContainsKey(conflicting_extensions, "extid2"));
   EXPECT_EQ(3u, event_log.size());
 }