| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <memory> | 5 #include <memory> |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/message_loop/message_loop.h" | 8 #include "base/message_loop/message_loop.h" |
| 9 #include "components/content_settings/core/browser/cookie_settings.h" | 9 #include "components/content_settings/core/browser/cookie_settings.h" |
| 10 #include "components/signin/core/browser/signin_header_helper.h" | 10 #include "components/signin/core/browser/signin_header_helper.h" |
| 11 #include "components/signin/core/common/signin_switches.h" | 11 #include "components/signin/core/common/signin_switches.h" |
| 12 #include "components/sync_preferences/testing_pref_service_syncable.h" | 12 #include "components/sync_preferences/testing_pref_service_syncable.h" |
| 13 #include "net/traffic_annotation/network_traffic_annotation_test_helper.h" |
| 13 #include "net/url_request/url_request_test_util.h" | 14 #include "net/url_request/url_request_test_util.h" |
| 14 #include "testing/gtest/include/gtest/gtest.h" | 15 #include "testing/gtest/include/gtest/gtest.h" |
| 15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
| 16 | 17 |
| 17 class SigninHeaderHelperTest : public testing::Test { | 18 class SigninHeaderHelperTest : public testing::Test { |
| 18 protected: | 19 protected: |
| 19 void SetUp() override { | 20 void SetUp() override { |
| 20 content_settings::CookieSettings::RegisterProfilePrefs(prefs_.registry()); | 21 content_settings::CookieSettings::RegisterProfilePrefs(prefs_.registry()); |
| 21 HostContentSettingsMap::RegisterProfilePrefs(prefs_.registry()); | 22 HostContentSettingsMap::RegisterProfilePrefs(prefs_.registry()); |
| 22 | 23 |
| (...skipping 12 matching lines...) Expand all Loading... |
| 35 url, account_id, cookie_settings_.get(), | 36 url, account_id, cookie_settings_.get(), |
| 36 signin::PROFILE_MODE_DEFAULT), | 37 signin::PROFILE_MODE_DEFAULT), |
| 37 expected_request); | 38 expected_request); |
| 38 } | 39 } |
| 39 | 40 |
| 40 void CheckMirrorHeaderRequest(const GURL& url, | 41 void CheckMirrorHeaderRequest(const GURL& url, |
| 41 const std::string& account_id, | 42 const std::string& account_id, |
| 42 const std::string& expected_request) { | 43 const std::string& expected_request) { |
| 43 bool expected_result = !expected_request.empty(); | 44 bool expected_result = !expected_request.empty(); |
| 44 std::unique_ptr<net::URLRequest> url_request = | 45 std::unique_ptr<net::URLRequest> url_request = |
| 45 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); | 46 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr, |
| 47 TRAFFIC_ANNOTATION_FOR_TESTS); |
| 46 EXPECT_EQ(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( | 48 EXPECT_EQ(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( |
| 47 url_request.get(), GURL(), account_id, cookie_settings_.get(), | 49 url_request.get(), GURL(), account_id, cookie_settings_.get(), |
| 48 signin::PROFILE_MODE_DEFAULT), | 50 signin::PROFILE_MODE_DEFAULT), |
| 49 expected_result); | 51 expected_result); |
| 50 std::string request; | 52 std::string request; |
| 51 EXPECT_EQ(url_request->extra_request_headers().GetHeader( | 53 EXPECT_EQ(url_request->extra_request_headers().GetHeader( |
| 52 signin::kChromeConnectedHeader, &request), | 54 signin::kChromeConnectedHeader, &request), |
| 53 expected_result); | 55 expected_result); |
| 54 if (expected_result) { | 56 if (expected_result) { |
| 55 EXPECT_EQ(expected_request, request); | 57 EXPECT_EQ(expected_request, request); |
| (...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 146 // Tests that the Mirror header request is returned normally when the redirect | 148 // Tests that the Mirror header request is returned normally when the redirect |
| 147 // URL is eligible. | 149 // URL is eligible. |
| 148 TEST_F(SigninHeaderHelperTest, TestMirrorHeaderEligibleRedirectURL) { | 150 TEST_F(SigninHeaderHelperTest, TestMirrorHeaderEligibleRedirectURL) { |
| 149 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 151 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 150 switches::kEnableAccountConsistency); | 152 switches::kEnableAccountConsistency); |
| 151 | 153 |
| 152 const GURL url("https://docs.google.com/document"); | 154 const GURL url("https://docs.google.com/document"); |
| 153 const GURL redirect_url("https://www.google.com"); | 155 const GURL redirect_url("https://www.google.com"); |
| 154 const std::string account_id = "0123456789"; | 156 const std::string account_id = "0123456789"; |
| 155 std::unique_ptr<net::URLRequest> url_request = | 157 std::unique_ptr<net::URLRequest> url_request = |
| 156 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); | 158 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr, |
| 159 TRAFFIC_ANNOTATION_FOR_TESTS); |
| 157 EXPECT_TRUE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( | 160 EXPECT_TRUE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( |
| 158 url_request.get(), redirect_url, account_id, cookie_settings_.get(), | 161 url_request.get(), redirect_url, account_id, cookie_settings_.get(), |
| 159 signin::PROFILE_MODE_DEFAULT)); | 162 signin::PROFILE_MODE_DEFAULT)); |
| 160 EXPECT_TRUE(url_request->extra_request_headers().HasHeader( | 163 EXPECT_TRUE(url_request->extra_request_headers().HasHeader( |
| 161 signin::kChromeConnectedHeader)); | 164 signin::kChromeConnectedHeader)); |
| 162 } | 165 } |
| 163 | 166 |
| 164 // Tests that the Mirror header request is stripped when the redirect URL is not | 167 // Tests that the Mirror header request is stripped when the redirect URL is not |
| 165 // eligible. | 168 // eligible. |
| 166 TEST_F(SigninHeaderHelperTest, TestMirrorHeaderNonEligibleRedirectURL) { | 169 TEST_F(SigninHeaderHelperTest, TestMirrorHeaderNonEligibleRedirectURL) { |
| 167 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 170 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 168 switches::kEnableAccountConsistency); | 171 switches::kEnableAccountConsistency); |
| 169 | 172 |
| 170 const GURL url("https://docs.google.com/document"); | 173 const GURL url("https://docs.google.com/document"); |
| 171 const GURL redirect_url("http://www.foo.com"); | 174 const GURL redirect_url("http://www.foo.com"); |
| 172 const std::string account_id = "0123456789"; | 175 const std::string account_id = "0123456789"; |
| 173 std::unique_ptr<net::URLRequest> url_request = | 176 std::unique_ptr<net::URLRequest> url_request = |
| 174 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); | 177 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr, |
| 178 TRAFFIC_ANNOTATION_FOR_TESTS); |
| 175 EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( | 179 EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( |
| 176 url_request.get(), redirect_url, account_id, cookie_settings_.get(), | 180 url_request.get(), redirect_url, account_id, cookie_settings_.get(), |
| 177 signin::PROFILE_MODE_DEFAULT)); | 181 signin::PROFILE_MODE_DEFAULT)); |
| 178 EXPECT_FALSE(url_request->extra_request_headers().HasHeader( | 182 EXPECT_FALSE(url_request->extra_request_headers().HasHeader( |
| 179 signin::kChromeConnectedHeader)); | 183 signin::kChromeConnectedHeader)); |
| 180 } | 184 } |
| 181 | 185 |
| 182 // Tests that the Mirror header, whatever its value is, is untouched when both | 186 // Tests that the Mirror header, whatever its value is, is untouched when both |
| 183 // the current and the redirect URL are non-eligible. | 187 // the current and the redirect URL are non-eligible. |
| 184 TEST_F(SigninHeaderHelperTest, TestIgnoreMirrorHeaderNonEligibleURLs) { | 188 TEST_F(SigninHeaderHelperTest, TestIgnoreMirrorHeaderNonEligibleURLs) { |
| 185 base::CommandLine::ForCurrentProcess()->AppendSwitch( | 189 base::CommandLine::ForCurrentProcess()->AppendSwitch( |
| 186 switches::kEnableAccountConsistency); | 190 switches::kEnableAccountConsistency); |
| 187 | 191 |
| 188 const GURL url("https://www.bar.com"); | 192 const GURL url("https://www.bar.com"); |
| 189 const GURL redirect_url("http://www.foo.com"); | 193 const GURL redirect_url("http://www.foo.com"); |
| 190 const std::string account_id = "0123456789"; | 194 const std::string account_id = "0123456789"; |
| 191 const std::string fake_header = "foo,bar"; | 195 const std::string fake_header = "foo,bar"; |
| 192 std::unique_ptr<net::URLRequest> url_request = | 196 std::unique_ptr<net::URLRequest> url_request = |
| 193 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr); | 197 url_request_context_.CreateRequest(url, net::DEFAULT_PRIORITY, nullptr, |
| 198 TRAFFIC_ANNOTATION_FOR_TESTS); |
| 194 url_request->SetExtraRequestHeaderByName(signin::kChromeConnectedHeader, | 199 url_request->SetExtraRequestHeaderByName(signin::kChromeConnectedHeader, |
| 195 fake_header, false); | 200 fake_header, false); |
| 196 EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( | 201 EXPECT_FALSE(signin::AppendOrRemoveMirrorRequestHeaderIfPossible( |
| 197 url_request.get(), redirect_url, account_id, cookie_settings_.get(), | 202 url_request.get(), redirect_url, account_id, cookie_settings_.get(), |
| 198 signin::PROFILE_MODE_DEFAULT)); | 203 signin::PROFILE_MODE_DEFAULT)); |
| 199 std::string header; | 204 std::string header; |
| 200 EXPECT_TRUE(url_request->extra_request_headers().GetHeader( | 205 EXPECT_TRUE(url_request->extra_request_headers().GetHeader( |
| 201 signin::kChromeConnectedHeader, &header)); | 206 signin::kChromeConnectedHeader, &header)); |
| 202 EXPECT_EQ(fake_header, header); | 207 EXPECT_EQ(fake_header, header); |
| 203 } | 208 } |
| OLD | NEW |