Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" | 5 #include "components/ntp_snippets/remote/remote_suggestions_provider_impl.h" |
| 6 | 6 |
| 7 #include <memory> | 7 #include <memory> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 396 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 407 MakeSuggestionsProviderWithoutInitialization() { | 407 MakeSuggestionsProviderWithoutInitialization() { |
| 408 scoped_refptr<base::SingleThreadTaskRunner> task_runner( | 408 scoped_refptr<base::SingleThreadTaskRunner> task_runner( |
| 409 base::ThreadTaskRunnerHandle::Get()); | 409 base::ThreadTaskRunnerHandle::Get()); |
| 410 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter = | 410 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter = |
| 411 new net::TestURLRequestContextGetter(task_runner.get()); | 411 new net::TestURLRequestContextGetter(task_runner.get()); |
| 412 | 412 |
| 413 utils_.ResetSigninManager(); | 413 utils_.ResetSigninManager(); |
| 414 auto suggestions_fetcher = base::MakeUnique<RemoteSuggestionsFetcher>( | 414 auto suggestions_fetcher = base::MakeUnique<RemoteSuggestionsFetcher>( |
| 415 utils_.fake_signin_manager(), /*token_service=*/nullptr, | 415 utils_.fake_signin_manager(), /*token_service=*/nullptr, |
| 416 std::move(request_context_getter), utils_.pref_service(), nullptr, | 416 std::move(request_context_getter), utils_.pref_service(), nullptr, |
| 417 base::Bind(&ParseJson), kAPIKey, &user_classifier_); | 417 base::Bind(&ParseJson), GetFetchEndpoint(true), kAPIKey, |
|
jkrcal
2017/02/23 13:25:22
nit: could you please add /*is_stable_or_beta_chan
sfiera
2017/02/23 13:28:47
Done.
| |
| 418 &user_classifier_); | |
| 418 suggestions_fetcher_ = suggestions_fetcher.get(); | 419 suggestions_fetcher_ = suggestions_fetcher.get(); |
| 419 | 420 |
| 420 auto image_fetcher = base::MakeUnique<NiceMock<MockImageFetcher>>(); | 421 auto image_fetcher = base::MakeUnique<NiceMock<MockImageFetcher>>(); |
| 421 | 422 |
| 422 image_fetcher_ = image_fetcher.get(); | 423 image_fetcher_ = image_fetcher.get(); |
| 423 EXPECT_CALL(*image_fetcher, SetImageFetcherDelegate(_)); | 424 EXPECT_CALL(*image_fetcher, SetImageFetcherDelegate(_)); |
| 424 auto image_decoder = base::MakeUnique<FakeImageDecoder>(); | 425 auto image_decoder = base::MakeUnique<FakeImageDecoder>(); |
| 425 image_decoder_ = image_decoder.get(); | 426 image_decoder_ = image_decoder.get(); |
| 426 EXPECT_FALSE(observer_); | 427 EXPECT_FALSE(observer_); |
| 427 observer_ = base::MakeUnique<FakeContentSuggestionsProviderObserver>(); | 428 observer_ = base::MakeUnique<FakeContentSuggestionsProviderObserver>(); |
| (...skipping 1386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1814 RemoteSuggestionsProvider::ProviderStatus)>::Call, | 1815 RemoteSuggestionsProvider::ProviderStatus)>::Call, |
| 1815 base::Unretained(&status_callback)))); | 1816 base::Unretained(&status_callback)))); |
| 1816 | 1817 |
| 1817 // Should be called when becoming disabled. | 1818 // Should be called when becoming disabled. |
| 1818 EXPECT_CALL(status_callback, | 1819 EXPECT_CALL(status_callback, |
| 1819 Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE)); | 1820 Call(RemoteSuggestionsProvider::ProviderStatus::INACTIVE)); |
| 1820 service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED); | 1821 service->EnterState(RemoteSuggestionsProviderImpl::State::DISABLED); |
| 1821 } | 1822 } |
| 1822 | 1823 |
| 1823 } // namespace ntp_snippets | 1824 } // namespace ntp_snippets |
| OLD | NEW |