Revert 219709 "Remove the Extensions URLRequestContext."

trunk/src/components/autofill/content/browser/wallet/wallet_signin_helper_unittest.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 "components/autofill/content/browser/wallet/wallet_signin_helper.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/autofill/content/browser/wallet/wallet_service_url.h"
 #include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
-#include "content/public/browser/storage_partition.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "google_apis/gaia/gaia_constants.h"
 #include "google_apis/gaia/gaia_urls.h"
 #include "google_apis/gaia/google_service_auth_error.h"
 #include "net/cookies/canonical_cookie.h"
 #include "net/cookies/cookie_monster.h"
 #include "net/cookies/cookie_options.h"
 #include "net/http/http_status_code.h"
 #include "net/url_request/test_url_fetcher_factory.h"
 #include "net/url_request/url_request.h"
@@ skipping 170 matching lines @@
 }
 
 TEST_F(WalletSigninHelperTest, PassiveUserInfoFailedUserInfo) {
   EXPECT_CALL(mock_delegate_, OnUserNameFetchFailure(_));
   signin_helper_->StartUserNameFetch();
   MockFailedGetAccountInfoResponse404();
 }
 
 TEST_F(WalletSigninHelperTest, GetWalletCookieValueWhenPresent) {
   EXPECT_CALL(mock_delegate_, OnDidFetchWalletCookieValue("gdToken"));
+  net::CookieMonster* cookie_monster = new net::CookieMonster(NULL, NULL);
   net::CookieOptions httponly_options;
   httponly_options.set_include_httponly();
   scoped_ptr<net::CanonicalCookie> cookie(
       net::CanonicalCookie::Create(GetPassiveAuthUrl().GetWithEmptyPath(),
                                    "gdToken=gdToken; HttpOnly",
                                    base::Time::Now(),
                                    httponly_options));
 
   net::CookieList cookie_list;
   cookie_list.push_back(*cookie);
-
-  net::CookieMonster* cookie_monster =
-      content::BrowserContext::GetDefaultStoragePartition(&browser_context_)->
-          GetCookieStoreForScheme(GetPassiveAuthUrl().scheme())->
-              GetCookieMonster();
   cookie_monster->InitializeFrom(cookie_list);
+  browser_context_.GetRequestContext()->GetURLRequestContext()
+      ->set_cookie_store(cookie_monster);
   signin_helper_->StartWalletCookieValueFetch();
   base::RunLoop().RunUntilIdle();
 }
 
 TEST_F(WalletSigninHelperTest, GetWalletCookieValueWhenMissing) {
   EXPECT_CALL(mock_delegate_, OnDidFetchWalletCookieValue(std::string()));
   net::CookieMonster* cookie_monster = new net::CookieMonster(NULL, NULL);
   net::CookieOptions httponly_options;
   httponly_options.set_include_httponly();
   scoped_ptr<net::CanonicalCookie> cookie(
       net::CanonicalCookie::Create(GetPassiveAuthUrl().GetWithEmptyPath(),
                                    "fake_cookie=monkeys; HttpOnly",
                                    base::Time::Now(),
                                    httponly_options));
 
   net::CookieList cookie_list;
   cookie_list.push_back(*cookie);
   cookie_monster->InitializeFrom(cookie_list);
   browser_context_.GetRequestContext()->GetURLRequestContext()
       ->set_cookie_store(cookie_monster);
   signin_helper_->StartWalletCookieValueFetch();
   base::RunLoop().RunUntilIdle();
 }
 
 // TODO(aruslan): http://crbug.com/188317 Need more tests.
 
 }  // namespace wallet
 }  // namespace autofill