| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "chrome/browser/chromeos/login/profile_auth_data.h" | 5 #include "chrome/browser/chromeos/login/profile_auth_data.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 224 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 235 std::string(), base::Time(), base::Time(), base::Time(), true, false, | 235 std::string(), base::Time(), base::Time(), base::Time(), true, false, |
| 236 net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT, | 236 net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT, |
| 237 net::CookieStore::SetCookiesCallback()); | 237 net::CookieStore::SetCookiesCallback()); |
| 238 cookies->SetCookieWithDetailsAsync( | 238 cookies->SetCookieWithDetailsAsync( |
| 239 GURL(kGAIACookieURL), kCookieName, cookie_value, std::string(), | 239 GURL(kGAIACookieURL), kCookieName, cookie_value, std::string(), |
| 240 std::string(), base::Time(), base::Time(), base::Time(), true, false, | 240 std::string(), base::Time(), base::Time(), base::Time(), true, false, |
| 241 net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT, | 241 net::CookieSameSite::DEFAULT_MODE, false, net::COOKIE_PRIORITY_DEFAULT, |
| 242 net::CookieStore::SetCookiesCallback()); | 242 net::CookieStore::SetCookiesCallback()); |
| 243 | 243 |
| 244 GetChannelIDs(browser_context) | 244 GetChannelIDs(browser_context) |
| 245 ->SetChannelID(base::WrapUnique(new net::ChannelIDStore::ChannelID( | 245 ->SetChannelID(base::MakeUnique<net::ChannelIDStore::ChannelID>( |
| 246 kChannelIDServerIdentifier, base::Time(), | 246 kChannelIDServerIdentifier, base::Time(), std::move(channel_id_key))); |
| 247 std::move(channel_id_key)))); | |
| 248 } | 247 } |
| 249 | 248 |
| 250 net::URLRequestContext* ProfileAuthDataTest::GetRequestContext( | 249 net::URLRequestContext* ProfileAuthDataTest::GetRequestContext( |
| 251 content::BrowserContext* browser_context) { | 250 content::BrowserContext* browser_context) { |
| 252 return content::BrowserContext::GetDefaultStoragePartition(browser_context)-> | 251 return content::BrowserContext::GetDefaultStoragePartition(browser_context)-> |
| 253 GetURLRequestContext()->GetURLRequestContext(); | 252 GetURLRequestContext()->GetURLRequestContext(); |
| 254 } | 253 } |
| 255 | 254 |
| 256 net::HttpAuthCache* ProfileAuthDataTest::GetProxyAuth( | 255 net::HttpAuthCache* ProfileAuthDataTest::GetProxyAuth( |
| 257 content::BrowserContext* browser_context) { | 256 content::BrowserContext* browser_context) { |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 327 PopulateUserBrowserContext(); | 326 PopulateUserBrowserContext(); |
| 328 | 327 |
| 329 Transfer(false, true); | 328 Transfer(false, true); |
| 330 | 329 |
| 331 VerifyTransferredUserProxyAuthEntry(); | 330 VerifyTransferredUserProxyAuthEntry(); |
| 332 VerifyUserCookies(kCookieValue2, kCookieValue1); | 331 VerifyUserCookies(kCookieValue2, kCookieValue1); |
| 333 VerifyUserChannelID(channel_id_key2_.get()); | 332 VerifyUserChannelID(channel_id_key2_.get()); |
| 334 } | 333 } |
| 335 | 334 |
| 336 } // namespace chromeos | 335 } // namespace chromeos |
| OLD | NEW |