Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(131)

Side by Side Diff: chrome/browser/ui/webui/signin/inline_login_ui_browsertest.cc

Issue 2035293002: Remove URLRequest::GetResponseCookies and URLRequestJob::GetResponseCookies. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/command_line.h" 5 #include "base/command_line.h"
6 #include "base/macros.h" 6 #include "base/macros.h"
7 #include "base/memory/ref_counted.h"
7 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
8 #include "build/build_config.h" 9 #include "build/build_config.h"
9 #include "chrome/browser/content_settings/cookie_settings_factory.h" 10 #include "chrome/browser/content_settings/cookie_settings_factory.h"
10 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h" 11 #include "chrome/browser/signin/fake_profile_oauth2_token_service_builder.h"
11 #include "chrome/browser/signin/fake_signin_manager_builder.h" 12 #include "chrome/browser/signin/fake_signin_manager_builder.h"
12 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" 13 #include "chrome/browser/signin/profile_oauth2_token_service_factory.h"
13 #include "chrome/browser/signin/signin_manager_factory.h" 14 #include "chrome/browser/signin/signin_manager_factory.h"
14 #include "chrome/browser/signin/signin_promo.h" 15 #include "chrome/browser/signin/signin_promo.h"
15 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
16 #include "chrome/browser/ui/tabs/tab_strip_model.h" 17 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 26 matching lines...) Expand all
43 #include "content/public/browser/storage_partition.h" 44 #include "content/public/browser/storage_partition.h"
44 #include "content/public/browser/web_contents.h" 45 #include "content/public/browser/web_contents.h"
45 #include "content/public/browser/web_ui_controller.h" 46 #include "content/public/browser/web_ui_controller.h"
46 #include "content/public/common/url_constants.h" 47 #include "content/public/common/url_constants.h"
47 #include "content/public/test/browser_test_utils.h" 48 #include "content/public/test/browser_test_utils.h"
48 #include "content/public/test/test_navigation_observer.h" 49 #include "content/public/test/test_navigation_observer.h"
49 #include "google_apis/gaia/fake_gaia.h" 50 #include "google_apis/gaia/fake_gaia.h"
50 #include "google_apis/gaia/gaia_switches.h" 51 #include "google_apis/gaia/gaia_switches.h"
51 #include "google_apis/gaia/gaia_urls.h" 52 #include "google_apis/gaia/gaia_urls.h"
52 #include "net/base/url_util.h" 53 #include "net/base/url_util.h"
54 #include "net/http/http_response_headers.h"
53 #include "net/test/embedded_test_server/embedded_test_server.h" 55 #include "net/test/embedded_test_server/embedded_test_server.h"
54 #include "net/test/embedded_test_server/http_request.h" 56 #include "net/test/embedded_test_server/http_request.h"
55 #include "net/test/embedded_test_server/http_response.h" 57 #include "net/test/embedded_test_server/http_response.h"
56 #include "net/url_request/test_url_fetcher_factory.h" 58 #include "net/url_request/test_url_fetcher_factory.h"
57 #include "net/url_request/url_request_status.h" 59 #include "net/url_request/url_request_status.h"
58 #include "testing/gmock/include/gmock/gmock.h" 60 #include "testing/gmock/include/gmock/gmock.h"
59 #include "testing/gtest/include/gtest/gtest.h" 61 #include "testing/gtest/include/gtest/gtest.h"
60 #include "ui/base/l10n/l10n_util.h" 62 #include "ui/base/l10n/l10n_util.h"
61 63
62 using ::testing::_; 64 using ::testing::_;
(...skipping 406 matching lines...) Expand 10 before | Expand all | Expand 10 after
469 token_service_ = static_cast<FakeProfileOAuth2TokenService*>( 471 token_service_ = static_cast<FakeProfileOAuth2TokenService*>(
470 ProfileOAuth2TokenServiceFactory::GetInstance()->GetForProfile( 472 ProfileOAuth2TokenServiceFactory::GetInstance()->GetForProfile(
471 profile)); 473 profile));
472 ASSERT_TRUE(token_service_); 474 ASSERT_TRUE(token_service_);
473 } 475 }
474 476
475 void SimulateStartCookieForOAuthLoginTokenExchangeSuccess( 477 void SimulateStartCookieForOAuthLoginTokenExchangeSuccess(
476 const std::string& cookie_string) { 478 const std::string& cookie_string) {
477 net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0); 479 net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
478 ASSERT_TRUE(fetcher); 480 ASSERT_TRUE(fetcher);
479 net::ResponseCookies cookies; 481 scoped_refptr<net::HttpResponseHeaders> reponse_headers =
480 cookies.push_back(cookie_string); 482 new net::HttpResponseHeaders("");
483 reponse_headers->AddHeader("Set-Cookie: " + cookie_string);
481 fetcher->set_status(net::URLRequestStatus()); 484 fetcher->set_status(net::URLRequestStatus());
482 fetcher->set_response_code(net::HTTP_OK); 485 fetcher->set_response_code(net::HTTP_OK);
483 fetcher->set_cookies(cookies); 486 fetcher->set_response_headers(reponse_headers);
484 fetcher->delegate()->OnURLFetchComplete(fetcher); 487 fetcher->delegate()->OnURLFetchComplete(fetcher);
485 } 488 }
486 489
487 void SimulateStartAuthCodeForOAuth2TokenExchangeSuccess( 490 void SimulateStartAuthCodeForOAuth2TokenExchangeSuccess(
488 const std::string& json_response) { 491 const std::string& json_response) {
489 net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0); 492 net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
490 ASSERT_TRUE(fetcher); 493 ASSERT_TRUE(fetcher);
491 fetcher->set_status(net::URLRequestStatus()); 494 fetcher->set_status(net::URLRequestStatus());
492 fetcher->set_response_code(net::HTTP_OK); 495 fetcher->set_response_code(net::HTTP_OK);
493 fetcher->SetResponseString(json_response); 496 fetcher->SetResponseString(json_response);
(...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after
881 ->AddObserver(&observer); 884 ->AddObserver(&observer);
882 base::RunLoop run_loop; 885 base::RunLoop run_loop;
883 EXPECT_CALL(observer, OnUntrustedLoginUIShown()) 886 EXPECT_CALL(observer, OnUntrustedLoginUIShown())
884 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit)); 887 .WillOnce(InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit));
885 888
886 ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password"); 889 ExecuteJsToSigninInSigninFrame(browser(), "email@gmail.com", "password");
887 run_loop.Run(); 890 run_loop.Run();
888 base::MessageLoop::current()->RunUntilIdle(); 891 base::MessageLoop::current()->RunUntilIdle();
889 } 892 }
890 #endif // OS_WIN 893 #endif // OS_WIN
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698