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

Side by Side Diff: components/ntp_snippets/ntp_snippets_service_unittest.cc

Issue 1997473004: Snippets are enabled when search suggestions are enabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 4 years, 7 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 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/ntp_snippets_service.h" 5 #include "components/ntp_snippets/ntp_snippets_service.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <vector> 8 #include <vector>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after
271 void CreateSnippetsService(bool enabled) { 271 void CreateSnippetsService(bool enabled) {
272 if (service_) 272 if (service_)
273 service_->Shutdown(); 273 service_->Shutdown();
274 274
275 scoped_refptr<base::SingleThreadTaskRunner> task_runner( 275 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
276 base::ThreadTaskRunnerHandle::Get()); 276 base::ThreadTaskRunnerHandle::Get());
277 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter = 277 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter =
278 new net::TestURLRequestContextGetter(task_runner.get()); 278 new net::TestURLRequestContextGetter(task_runner.get());
279 279
280 service_.reset(new NTPSnippetsService( 280 service_.reset(new NTPSnippetsService(
281 pref_service_.get(), mock_sync_service_.get(), nullptr, task_runner, 281 enabled, pref_service_.get(), mock_sync_service_.get(), nullptr,
282 std::string("fr"), &scheduler_, 282 task_runner, std::string("fr"), &scheduler_,
283 base::WrapUnique(new NTPSnippetsFetcher( 283 base::WrapUnique(new NTPSnippetsFetcher(
284 fake_signin_manager_.get(), fake_token_service_.get(), 284 fake_signin_manager_.get(), fake_token_service_.get(),
285 std::move(request_context_getter), base::Bind(&ParseJson), 285 std::move(request_context_getter), base::Bind(&ParseJson),
286 /*is_stable_channel=*/true)), 286 /*is_stable_channel=*/true)),
287 /*image_fetcher=*/nullptr)); 287 /*image_fetcher=*/nullptr));
288 service_->Init(enabled);
289 } 288 }
290 289
291 protected: 290 protected:
292 const GURL& test_url() { return test_url_; } 291 const GURL& test_url() { return test_url_; }
293 NTPSnippetsService* service() { return service_.get(); } 292 NTPSnippetsService* service() { return service_.get(); }
294 MockScheduler& mock_scheduler() { return scheduler_; } 293 MockScheduler& mock_scheduler() { return scheduler_; }
295 MockSyncService* mock_sync_service() { return mock_sync_service_.get(); } 294 MockSyncService* mock_sync_service() { return mock_sync_service_.get(); }
296 295
297 // Provide the json to be returned by the fake fetcher. 296 // Provide the json to be returned by the fake fetcher.
298 void SetUpFetchResponse(const std::string& json) { 297 void SetUpFetchResponse(const std::string& json) {
(...skipping 583 matching lines...) Expand 10 before | Expand all | Expand 10 after
882 // The service should be ready again and load snippets. 881 // The service should be ready again and load snippets.
883 SetUpFetchResponse(GetTestJson({GetSnippet()})); 882 SetUpFetchResponse(GetTestJson({GetSnippet()}));
884 service()->OnStateChanged(); 883 service()->OnStateChanged();
885 base::RunLoop().RunUntilIdle(); 884 base::RunLoop().RunUntilIdle();
886 EXPECT_FALSE(service()->snippets().empty()); 885 EXPECT_FALSE(service()->snippets().empty());
887 886
888 service()->RemoveObserver(&mock_observer); 887 service()->RemoveObserver(&mock_observer);
889 } 888 }
890 889
891 } // namespace ntp_snippets 890 } // namespace ntp_snippets
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698