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 "base/macros.h" | 5 #include "base/macros.h" |
6 #include "base/message_loop/message_loop.h" | 6 #include "base/message_loop/message_loop.h" |
7 #include "base/thread_task_runner_handle.h" | 7 #include "base/thread_task_runner_handle.h" |
8 #include "base/time/time.h" | 8 #include "base/time/time.h" |
9 #include "components/ntp_snippets/ntp_snippet.h" | 9 #include "components/ntp_snippets/ntp_snippet.h" |
10 #include "components/ntp_snippets/ntp_snippets_fetcher.h" | 10 #include "components/ntp_snippets/ntp_snippets_fetcher.h" |
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
54 scoped_refptr<base::SingleThreadTaskRunner> task_runner( | 54 scoped_refptr<base::SingleThreadTaskRunner> task_runner( |
55 base::ThreadTaskRunnerHandle::Get()); | 55 base::ThreadTaskRunnerHandle::Get()); |
56 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter = | 56 scoped_refptr<net::TestURLRequestContextGetter> request_context_getter = |
57 new net::TestURLRequestContextGetter(task_runner.get()); | 57 new net::TestURLRequestContextGetter(task_runner.get()); |
58 FakeProfileOAuth2TokenService* token_service = | 58 FakeProfileOAuth2TokenService* token_service = |
59 new FakeProfileOAuth2TokenService(); | 59 new FakeProfileOAuth2TokenService(); |
60 FakeSigninManagerBase* signin_manager = new FakeSigninManagerBase( | 60 FakeSigninManagerBase* signin_manager = new FakeSigninManagerBase( |
61 signin_client_.get(), account_tracker_.get()); | 61 signin_client_.get(), account_tracker_.get()); |
62 | 62 |
63 scoped_ptr<NTPSnippetsService> service( | 63 scoped_ptr<NTPSnippetsService> service( |
64 new NTPSnippetsService(task_runner.get(), std::string("fr"), | 64 new NTPSnippetsService(task_runner.get(), std::string("fr"), nullptr, |
65 make_scoped_ptr(new NTPSnippetsFetcher(task_runner.get(), | 65 make_scoped_ptr(new NTPSnippetsFetcher(task_runner.get(), |
66 signin_manager, token_service, request_context_getter, | 66 signin_manager, token_service, request_context_getter, |
67 base::FilePath())))); | 67 base::FilePath())))); |
68 return service; | 68 return service; |
69 } | 69 } |
70 | 70 |
71 private: | 71 private: |
72 scoped_ptr<AccountTrackerService> account_tracker_; | 72 scoped_ptr<AccountTrackerService> account_tracker_; |
73 scoped_ptr<TestSigninClient> signin_client_; | 73 scoped_ptr<TestSigninClient> signin_client_; |
74 base::MessageLoop message_loop_; | 74 base::MessageLoop message_loop_; |
75 DISALLOW_COPY_AND_ASSIGN(NTPSnippetsServiceTest); | 75 DISALLOW_COPY_AND_ASSIGN(NTPSnippetsServiceTest); |
76 }; | 76 }; |
77 | 77 |
78 | |
79 TEST_F(NTPSnippetsServiceTest, Create) { | 78 TEST_F(NTPSnippetsServiceTest, Create) { |
80 scoped_ptr<NTPSnippetsService> service(CreateSnippetService()); | 79 scoped_ptr<NTPSnippetsService> service(CreateSnippetService()); |
81 EXPECT_FALSE(service->is_loaded()); | 80 EXPECT_FALSE(service->is_loaded()); |
82 } | 81 } |
83 | 82 |
84 TEST_F(NTPSnippetsServiceTest, Loop) { | 83 TEST_F(NTPSnippetsServiceTest, Loop) { |
85 scoped_ptr<NTPSnippetsService> service(CreateSnippetService()); | 84 scoped_ptr<NTPSnippetsService> service(CreateSnippetService()); |
86 | 85 |
87 EXPECT_FALSE(service->is_loaded()); | 86 EXPECT_FALSE(service->is_loaded()); |
88 | 87 |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
165 EXPECT_TRUE(service->LoadFromJSONString(json_str)); | 164 EXPECT_TRUE(service->LoadFromJSONString(json_str)); |
166 | 165 |
167 SnippetObserver observer; | 166 SnippetObserver observer; |
168 service->AddObserver(&observer); | 167 service->AddObserver(&observer); |
169 | 168 |
170 EXPECT_TRUE(observer.loaded_); | 169 EXPECT_TRUE(observer.loaded_); |
171 | 170 |
172 service->RemoveObserver(&observer); | 171 service->RemoveObserver(&observer); |
173 } | 172 } |
174 } // namespace ntp_snippets | 173 } // namespace ntp_snippets |
OLD | NEW |