| OLD | NEW |
| 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/basictypes.h" | 5 #include "base/basictypes.h" |
| 6 #include "base/bind.h" | 6 #include "base/bind.h" |
| 7 #include "base/callback.h" | 7 #include "base/callback.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #include "base/compiler_specific.h" | 9 #include "base/compiler_specific.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 404 GURL(kURLGaiaToken), | 404 GURL(kURLGaiaToken), |
| 405 kResponseGaiaToken, | 405 kResponseGaiaToken, |
| 406 net::HTTP_OK, | 406 net::HTTP_OK, |
| 407 net::URLRequestStatus::SUCCESS); | 407 net::URLRequestStatus::SUCCESS); |
| 408 | 408 |
| 409 EXPECT_CALL(fake_url_fetcher_creator(), OnCreateFakeURLFetcher( | 409 EXPECT_CALL(fake_url_fetcher_creator(), OnCreateFakeURLFetcher( |
| 410 kURLGaiaToken)) | 410 kURLGaiaToken)) |
| 411 .Times(AnyNumber()); | 411 .Times(AnyNumber()); |
| 412 | 412 |
| 413 fake_fetcher_factory().SetFakeResponse( | 413 fake_fetcher_factory().SetFakeResponse( |
| 414 GaiaUrls::GetInstance()->people_get_url(), | 414 GaiaUrls::GetInstance()->oauth_user_info_url(), |
| 415 kResponseGaiaId, | 415 kResponseGaiaId, |
| 416 net::HTTP_OK, | 416 net::HTTP_OK, |
| 417 net::URLRequestStatus::SUCCESS); | 417 net::URLRequestStatus::SUCCESS); |
| 418 | 418 |
| 419 EXPECT_CALL(fake_url_fetcher_creator(), OnCreateFakeURLFetcher( | 419 EXPECT_CALL(fake_url_fetcher_creator(), OnCreateFakeURLFetcher( |
| 420 GaiaUrls::GetInstance()->people_get_url().spec())) | 420 GaiaUrls::GetInstance()->oauth_user_info_url().spec())) |
| 421 .Times(AnyNumber()); | 421 .Times(AnyNumber()); |
| 422 | 422 |
| 423 ProfileOAuth2TokenService* token_service = | 423 ProfileOAuth2TokenService* token_service = |
| 424 ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile()); | 424 ProfileOAuth2TokenServiceFactory::GetForProfile(browser()->profile()); |
| 425 | 425 |
| 426 token_service->UpdateCredentials("user@host.com", "MyFakeToken"); | 426 token_service->UpdateCredentials("user@host.com", "MyFakeToken"); |
| 427 | 427 |
| 428 AddLibrary(base::FilePath(FILE_PATH_LITERAL("local_discovery_ui_test.js"))); | 428 AddLibrary(base::FilePath(FILE_PATH_LITERAL("local_discovery_ui_test.js"))); |
| 429 } | 429 } |
| 430 | 430 |
| (...skipping 131 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 562 kAnnouncePacketRegistered, sizeof(kAnnouncePacketRegistered)); | 562 kAnnouncePacketRegistered, sizeof(kAnnouncePacketRegistered)); |
| 563 | 563 |
| 564 base::MessageLoop::current()->RunUntilIdle(); | 564 base::MessageLoop::current()->RunUntilIdle(); |
| 565 | 565 |
| 566 EXPECT_TRUE(WebUIBrowserTest::RunJavascriptTest("expectRegisterDone")); | 566 EXPECT_TRUE(WebUIBrowserTest::RunJavascriptTest("expectRegisterDone")); |
| 567 } | 567 } |
| 568 | 568 |
| 569 } // namespace | 569 } // namespace |
| 570 | 570 |
| 571 } // namespace local_discovery | 571 } // namespace local_discovery |
| OLD | NEW |