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

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. Add a TODO. 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 224 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 void CreateSnippetsService(bool enabled) { 235 void CreateSnippetsService(bool enabled) {
236 if (service_) 236 if (service_)
237 service_->Shutdown(); 237 service_->Shutdown();
238 238
239 scoped_refptr<base::SingleThreadTaskRunner> task_runner( 239 scoped_refptr<base::SingleThreadTaskRunner> task_runner(
240 base::ThreadTaskRunnerHandle::Get()); 240 base::ThreadTaskRunnerHandle::Get());
241 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter = 241 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter =
242 new net::TestURLRequestContextGetter(task_runner.get()); 242 new net::TestURLRequestContextGetter(task_runner.get());
243 243
244 service_.reset(new NTPSnippetsService( 244 service_.reset(new NTPSnippetsService(
245 pref_service_.get(), nullptr, task_runner, std::string("fr"), 245 enabled, pref_service_.get(), nullptr, task_runner, std::string("fr"),
246 &scheduler_, 246 &scheduler_,
247 base::WrapUnique(new NTPSnippetsFetcher( 247 base::WrapUnique(new NTPSnippetsFetcher(
248 fake_signin_manager_.get(), fake_token_service_.get(), 248 fake_signin_manager_.get(), fake_token_service_.get(),
249 std::move(request_context_getter), base::Bind(&ParseJson), 249 std::move(request_context_getter), base::Bind(&ParseJson),
250 /*is_stable_channel=*/true)), 250 /*is_stable_channel=*/true)),
251 /*image_fetcher=*/nullptr)); 251 /*image_fetcher=*/nullptr));
252 service_->Init(enabled); 252 service_->Init();
253 } 253 }
254 254
255 protected: 255 protected:
256 const GURL& test_url() { return test_url_; } 256 const GURL& test_url() { return test_url_; }
257 NTPSnippetsService* service() { return service_.get(); } 257 NTPSnippetsService* service() { return service_.get(); }
258 MockScheduler& mock_scheduler() { return scheduler_; } 258 MockScheduler& mock_scheduler() { return scheduler_; }
259 259
260 void LoadFromJSONString(const std::string& json) { 260 void LoadFromJSONString(const std::string& json) {
261 fake_url_fetcher_factory_.SetFakeResponse(test_url_, json, net::HTTP_OK, 261 fake_url_fetcher_factory_.SetFakeResponse(test_url_, json, net::HTTP_OK,
262 net::URLRequestStatus::SUCCESS); 262 net::URLRequestStatus::SUCCESS);
(...skipping 580 matching lines...) Expand 10 before | Expand all | Expand 10 after
843 LoadFromJSONString(base::StringPrintf( 843 LoadFromJSONString(base::StringPrintf(
844 kChromeReaderResponseMultipleUrls, url_aol.c_str(), 844 kChromeReaderResponseMultipleUrls, url_aol.c_str(),
845 NTPSnippet::TimeToJsonString(GetDefaultCreationTime()).c_str(), 845 NTPSnippet::TimeToJsonString(GetDefaultCreationTime()).c_str(),
846 NTPSnippet::TimeToJsonString(base::Time::Now() + 846 NTPSnippet::TimeToJsonString(base::Time::Now() +
847 base::TimeDelta::FromHours(1)) 847 base::TimeDelta::FromHours(1))
848 .c_str())); 848 .c_str()));
849 ASSERT_THAT(service()->snippets(), IsEmpty()); 849 ASSERT_THAT(service()->snippets(), IsEmpty());
850 } 850 }
851 851
852 } // namespace ntp_snippets 852 } // namespace ntp_snippets
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698