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 <utility> |
| 6 |
5 #include "base/bind.h" | 7 #include "base/bind.h" |
6 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
7 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
8 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
9 #include "base/location.h" | 11 #include "base/location.h" |
10 #include "base/macros.h" | 12 #include "base/macros.h" |
11 #include "base/memory/ref_counted.h" | 13 #include "base/memory/ref_counted.h" |
12 #include "base/memory/scoped_ptr.h" | 14 #include "base/memory/scoped_ptr.h" |
13 #include "base/message_loop/message_loop.h" | 15 #include "base/message_loop/message_loop.h" |
14 #include "base/path_service.h" | 16 #include "base/path_service.h" |
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 public: | 235 public: |
234 static scoped_ptr<CrxDownloader> Create( | 236 static scoped_ptr<CrxDownloader> Create( |
235 bool is_background_download, | 237 bool is_background_download, |
236 net::URLRequestContextGetter* context_getter, | 238 net::URLRequestContextGetter* context_getter, |
237 const scoped_refptr<base::SequencedTaskRunner>& | 239 const scoped_refptr<base::SequencedTaskRunner>& |
238 url_fetcher_task_runner) { | 240 url_fetcher_task_runner) { |
239 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 241 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
240 } | 242 } |
241 | 243 |
242 private: | 244 private: |
243 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 245 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
244 ~FakeCrxDownloader() override {} | 246 ~FakeCrxDownloader() override {} |
245 | 247 |
246 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } | 248 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } |
247 }; | 249 }; |
248 | 250 |
249 class FakePingManager : public FakePingManagerImpl { | 251 class FakePingManager : public FakePingManagerImpl { |
250 public: | 252 public: |
251 explicit FakePingManager(const Configurator& config) | 253 explicit FakePingManager(const Configurator& config) |
252 : FakePingManagerImpl(config) {} | 254 : FakePingManagerImpl(config) {} |
253 ~FakePingManager() override { EXPECT_TRUE(items().empty()); } | 255 ~FakePingManager() override { EXPECT_TRUE(items().empty()); } |
254 }; | 256 }; |
255 | 257 |
256 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); | 258 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); |
257 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 259 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
258 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 260 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
259 &FakeCrxDownloader::Create)); | 261 &FakeCrxDownloader::Create)); |
260 | 262 |
261 // Verify that calling Update does not set ondemand. | 263 // Verify that calling Update does not set ondemand. |
262 OnDemandTester ondemand_tester(update_client, false); | 264 OnDemandTester ondemand_tester(update_client, false); |
263 | 265 |
264 MockObserver observer; | 266 MockObserver observer; |
265 ON_CALL(observer, OnEvent(_, _)) | 267 ON_CALL(observer, OnEvent(_, _)) |
266 .WillByDefault(Invoke(&ondemand_tester, &OnDemandTester::CheckOnDemand)); | 268 .WillByDefault(Invoke(&ondemand_tester, &OnDemandTester::CheckOnDemand)); |
267 | 269 |
268 InSequence seq; | 270 InSequence seq; |
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
369 public: | 371 public: |
370 static scoped_ptr<CrxDownloader> Create( | 372 static scoped_ptr<CrxDownloader> Create( |
371 bool is_background_download, | 373 bool is_background_download, |
372 net::URLRequestContextGetter* context_getter, | 374 net::URLRequestContextGetter* context_getter, |
373 const scoped_refptr<base::SequencedTaskRunner>& | 375 const scoped_refptr<base::SequencedTaskRunner>& |
374 url_fetcher_task_runner) { | 376 url_fetcher_task_runner) { |
375 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 377 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
376 } | 378 } |
377 | 379 |
378 private: | 380 private: |
379 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 381 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
380 ~FakeCrxDownloader() override {} | 382 ~FakeCrxDownloader() override {} |
381 | 383 |
382 void DoStartDownload(const GURL& url) override { | 384 void DoStartDownload(const GURL& url) override { |
383 DownloadMetrics download_metrics; | 385 DownloadMetrics download_metrics; |
384 download_metrics.url = url; | 386 download_metrics.url = url; |
385 download_metrics.downloader = DownloadMetrics::kNone; | 387 download_metrics.downloader = DownloadMetrics::kNone; |
386 download_metrics.error = 0; | 388 download_metrics.error = 0; |
387 download_metrics.downloaded_bytes = 1843; | 389 download_metrics.downloaded_bytes = 1843; |
388 download_metrics.total_bytes = 1843; | 390 download_metrics.total_bytes = 1843; |
389 download_metrics.download_time_ms = 1000; | 391 download_metrics.download_time_ms = 1000; |
(...skipping 29 matching lines...) Expand all Loading... |
419 EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id); | 421 EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id); |
420 EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version)); | 422 EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version)); |
421 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version)); | 423 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version)); |
422 EXPECT_EQ(0, ping_items[0].error_category); | 424 EXPECT_EQ(0, ping_items[0].error_category); |
423 EXPECT_EQ(0, ping_items[0].error_code); | 425 EXPECT_EQ(0, ping_items[0].error_code); |
424 } | 426 } |
425 }; | 427 }; |
426 | 428 |
427 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); | 429 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); |
428 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 430 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
429 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 431 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
430 &FakeCrxDownloader::Create)); | 432 &FakeCrxDownloader::Create)); |
431 | 433 |
432 MockObserver observer; | 434 MockObserver observer; |
433 { | 435 { |
434 InSequence seq; | 436 InSequence seq; |
435 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 437 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
436 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 438 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
437 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, | 439 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, |
438 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 440 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
439 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, | 441 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, |
(...skipping 132 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
572 public: | 574 public: |
573 static scoped_ptr<CrxDownloader> Create( | 575 static scoped_ptr<CrxDownloader> Create( |
574 bool is_background_download, | 576 bool is_background_download, |
575 net::URLRequestContextGetter* context_getter, | 577 net::URLRequestContextGetter* context_getter, |
576 const scoped_refptr<base::SequencedTaskRunner>& | 578 const scoped_refptr<base::SequencedTaskRunner>& |
577 url_fetcher_task_runner) { | 579 url_fetcher_task_runner) { |
578 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 580 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
579 } | 581 } |
580 | 582 |
581 private: | 583 private: |
582 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 584 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
583 ~FakeCrxDownloader() override {} | 585 ~FakeCrxDownloader() override {} |
584 | 586 |
585 void DoStartDownload(const GURL& url) override { | 587 void DoStartDownload(const GURL& url) override { |
586 DownloadMetrics download_metrics; | 588 DownloadMetrics download_metrics; |
587 FilePath path; | 589 FilePath path; |
588 Result result; | 590 Result result; |
589 if (url.path() == "/download/jebgalgnebhfojomionfpkfelancnnkf.crx") { | 591 if (url.path() == "/download/jebgalgnebhfojomionfpkfelancnnkf.crx") { |
590 download_metrics.url = url; | 592 download_metrics.url = url; |
591 download_metrics.downloader = DownloadMetrics::kNone; | 593 download_metrics.downloader = DownloadMetrics::kNone; |
592 download_metrics.error = 0; | 594 download_metrics.error = 0; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
647 EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id); | 649 EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id); |
648 EXPECT_TRUE(base::Version("0.8").Equals(ping_items[1].previous_version)); | 650 EXPECT_TRUE(base::Version("0.8").Equals(ping_items[1].previous_version)); |
649 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].next_version)); | 651 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].next_version)); |
650 EXPECT_EQ(0, ping_items[1].error_category); | 652 EXPECT_EQ(0, ping_items[1].error_category); |
651 EXPECT_EQ(0, ping_items[1].error_code); | 653 EXPECT_EQ(0, ping_items[1].error_code); |
652 } | 654 } |
653 }; | 655 }; |
654 | 656 |
655 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); | 657 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); |
656 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 658 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
657 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 659 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
658 &FakeCrxDownloader::Create)); | 660 &FakeCrxDownloader::Create)); |
659 | 661 |
660 MockObserver observer; | 662 MockObserver observer; |
661 { | 663 { |
662 InSequence seq; | 664 InSequence seq; |
663 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 665 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
664 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 666 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
665 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, | 667 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, |
666 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 668 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
667 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, | 669 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, |
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
810 public: | 812 public: |
811 static scoped_ptr<CrxDownloader> Create( | 813 static scoped_ptr<CrxDownloader> Create( |
812 bool is_background_download, | 814 bool is_background_download, |
813 net::URLRequestContextGetter* context_getter, | 815 net::URLRequestContextGetter* context_getter, |
814 const scoped_refptr<base::SequencedTaskRunner>& | 816 const scoped_refptr<base::SequencedTaskRunner>& |
815 url_fetcher_task_runner) { | 817 url_fetcher_task_runner) { |
816 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 818 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
817 } | 819 } |
818 | 820 |
819 private: | 821 private: |
820 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 822 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
821 ~FakeCrxDownloader() override {} | 823 ~FakeCrxDownloader() override {} |
822 | 824 |
823 void DoStartDownload(const GURL& url) override { | 825 void DoStartDownload(const GURL& url) override { |
824 DownloadMetrics download_metrics; | 826 DownloadMetrics download_metrics; |
825 FilePath path; | 827 FilePath path; |
826 Result result; | 828 Result result; |
827 if (url.path() == "/download/jebgalgnebhfojomionfpkfelancnnkf.crx") { | 829 if (url.path() == "/download/jebgalgnebhfojomionfpkfelancnnkf.crx") { |
828 download_metrics.url = url; | 830 download_metrics.url = url; |
829 download_metrics.downloader = DownloadMetrics::kNone; | 831 download_metrics.downloader = DownloadMetrics::kNone; |
830 download_metrics.error = -118; | 832 download_metrics.error = -118; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
885 EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id); | 887 EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id); |
886 EXPECT_TRUE(base::Version("0.8").Equals(ping_items[1].previous_version)); | 888 EXPECT_TRUE(base::Version("0.8").Equals(ping_items[1].previous_version)); |
887 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].next_version)); | 889 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].next_version)); |
888 EXPECT_EQ(0, ping_items[1].error_category); | 890 EXPECT_EQ(0, ping_items[1].error_category); |
889 EXPECT_EQ(0, ping_items[1].error_code); | 891 EXPECT_EQ(0, ping_items[1].error_code); |
890 } | 892 } |
891 }; | 893 }; |
892 | 894 |
893 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); | 895 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); |
894 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 896 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
895 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 897 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
896 &FakeCrxDownloader::Create)); | 898 &FakeCrxDownloader::Create)); |
897 | 899 |
898 MockObserver observer; | 900 MockObserver observer; |
899 { | 901 { |
900 InSequence seq; | 902 InSequence seq; |
901 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 903 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
902 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 904 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
903 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, | 905 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, |
904 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 906 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
905 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, | 907 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, |
(...skipping 162 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1068 public: | 1070 public: |
1069 static scoped_ptr<CrxDownloader> Create( | 1071 static scoped_ptr<CrxDownloader> Create( |
1070 bool is_background_download, | 1072 bool is_background_download, |
1071 net::URLRequestContextGetter* context_getter, | 1073 net::URLRequestContextGetter* context_getter, |
1072 const scoped_refptr<base::SequencedTaskRunner>& | 1074 const scoped_refptr<base::SequencedTaskRunner>& |
1073 url_fetcher_task_runner) { | 1075 url_fetcher_task_runner) { |
1074 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 1076 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
1075 } | 1077 } |
1076 | 1078 |
1077 private: | 1079 private: |
1078 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 1080 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
1079 ~FakeCrxDownloader() override {} | 1081 ~FakeCrxDownloader() override {} |
1080 | 1082 |
1081 void DoStartDownload(const GURL& url) override { | 1083 void DoStartDownload(const GURL& url) override { |
1082 DownloadMetrics download_metrics; | 1084 DownloadMetrics download_metrics; |
1083 FilePath path; | 1085 FilePath path; |
1084 Result result; | 1086 Result result; |
1085 if (url.path() == "/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx") { | 1087 if (url.path() == "/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx") { |
1086 download_metrics.url = url; | 1088 download_metrics.url = url; |
1087 download_metrics.downloader = DownloadMetrics::kNone; | 1089 download_metrics.downloader = DownloadMetrics::kNone; |
1088 download_metrics.error = 0; | 1090 download_metrics.error = 0; |
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1143 EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id); | 1145 EXPECT_EQ("ihfokbkgjpifnbbojhneepfflplebdkc", ping_items[1].id); |
1144 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].previous_version)); | 1146 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].previous_version)); |
1145 EXPECT_TRUE(base::Version("2.0").Equals(ping_items[1].next_version)); | 1147 EXPECT_TRUE(base::Version("2.0").Equals(ping_items[1].next_version)); |
1146 EXPECT_EQ(0, ping_items[1].diff_error_category); | 1148 EXPECT_EQ(0, ping_items[1].diff_error_category); |
1147 EXPECT_EQ(0, ping_items[1].diff_error_code); | 1149 EXPECT_EQ(0, ping_items[1].diff_error_code); |
1148 } | 1150 } |
1149 }; | 1151 }; |
1150 | 1152 |
1151 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); | 1153 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); |
1152 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 1154 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
1153 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 1155 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
1154 &FakeCrxDownloader::Create)); | 1156 &FakeCrxDownloader::Create)); |
1155 | 1157 |
1156 MockObserver observer; | 1158 MockObserver observer; |
1157 { | 1159 { |
1158 InSequence seq; | 1160 InSequence seq; |
1159 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 1161 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
1160 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); | 1162 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); |
1161 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, | 1163 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, |
1162 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); | 1164 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); |
1163 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, | 1165 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, |
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1305 public: | 1307 public: |
1306 static scoped_ptr<CrxDownloader> Create( | 1308 static scoped_ptr<CrxDownloader> Create( |
1307 bool is_background_download, | 1309 bool is_background_download, |
1308 net::URLRequestContextGetter* context_getter, | 1310 net::URLRequestContextGetter* context_getter, |
1309 const scoped_refptr<base::SequencedTaskRunner>& | 1311 const scoped_refptr<base::SequencedTaskRunner>& |
1310 url_fetcher_task_runner) { | 1312 url_fetcher_task_runner) { |
1311 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 1313 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
1312 } | 1314 } |
1313 | 1315 |
1314 private: | 1316 private: |
1315 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 1317 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
1316 ~FakeCrxDownloader() override {} | 1318 ~FakeCrxDownloader() override {} |
1317 | 1319 |
1318 void DoStartDownload(const GURL& url) override { | 1320 void DoStartDownload(const GURL& url) override { |
1319 DownloadMetrics download_metrics; | 1321 DownloadMetrics download_metrics; |
1320 download_metrics.url = url; | 1322 download_metrics.url = url; |
1321 download_metrics.downloader = DownloadMetrics::kNone; | 1323 download_metrics.downloader = DownloadMetrics::kNone; |
1322 download_metrics.error = 0; | 1324 download_metrics.error = 0; |
1323 download_metrics.downloaded_bytes = 1843; | 1325 download_metrics.downloaded_bytes = 1843; |
1324 download_metrics.total_bytes = 1843; | 1326 download_metrics.total_bytes = 1843; |
1325 download_metrics.download_time_ms = 1000; | 1327 download_metrics.download_time_ms = 1000; |
(...skipping 29 matching lines...) Expand all Loading... |
1355 EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id); | 1357 EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id); |
1356 EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version)); | 1358 EXPECT_TRUE(base::Version("0.9").Equals(ping_items[0].previous_version)); |
1357 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version)); | 1359 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version)); |
1358 EXPECT_EQ(3, ping_items[0].error_category); // kInstallError. | 1360 EXPECT_EQ(3, ping_items[0].error_category); // kInstallError. |
1359 EXPECT_EQ(9, ping_items[0].error_code); // kInstallerError. | 1361 EXPECT_EQ(9, ping_items[0].error_code); // kInstallerError. |
1360 } | 1362 } |
1361 }; | 1363 }; |
1362 | 1364 |
1363 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); | 1365 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); |
1364 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 1366 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
1365 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 1367 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
1366 &FakeCrxDownloader::Create)); | 1368 &FakeCrxDownloader::Create)); |
1367 | 1369 |
1368 MockObserver observer; | 1370 MockObserver observer; |
1369 { | 1371 { |
1370 InSequence seq; | 1372 InSequence seq; |
1371 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 1373 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
1372 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 1374 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
1373 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, | 1375 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, |
1374 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 1376 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
1375 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, | 1377 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, |
(...skipping 148 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1524 public: | 1526 public: |
1525 static scoped_ptr<CrxDownloader> Create( | 1527 static scoped_ptr<CrxDownloader> Create( |
1526 bool is_background_download, | 1528 bool is_background_download, |
1527 net::URLRequestContextGetter* context_getter, | 1529 net::URLRequestContextGetter* context_getter, |
1528 const scoped_refptr<base::SequencedTaskRunner>& | 1530 const scoped_refptr<base::SequencedTaskRunner>& |
1529 url_fetcher_task_runner) { | 1531 url_fetcher_task_runner) { |
1530 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 1532 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
1531 } | 1533 } |
1532 | 1534 |
1533 private: | 1535 private: |
1534 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 1536 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
1535 ~FakeCrxDownloader() override {} | 1537 ~FakeCrxDownloader() override {} |
1536 | 1538 |
1537 void DoStartDownload(const GURL& url) override { | 1539 void DoStartDownload(const GURL& url) override { |
1538 DownloadMetrics download_metrics; | 1540 DownloadMetrics download_metrics; |
1539 FilePath path; | 1541 FilePath path; |
1540 Result result; | 1542 Result result; |
1541 if (url.path() == "/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx") { | 1543 if (url.path() == "/download/ihfokbkgjpifnbbojhneepfflplebdkc_1.crx") { |
1542 download_metrics.url = url; | 1544 download_metrics.url = url; |
1543 download_metrics.downloader = DownloadMetrics::kNone; | 1545 download_metrics.downloader = DownloadMetrics::kNone; |
1544 download_metrics.error = 0; | 1546 download_metrics.error = 0; |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1615 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].previous_version)); | 1617 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[1].previous_version)); |
1616 EXPECT_TRUE(base::Version("2.0").Equals(ping_items[1].next_version)); | 1618 EXPECT_TRUE(base::Version("2.0").Equals(ping_items[1].next_version)); |
1617 EXPECT_TRUE(ping_items[1].diff_update_failed); | 1619 EXPECT_TRUE(ping_items[1].diff_update_failed); |
1618 EXPECT_EQ(1, ping_items[1].diff_error_category); // kNetworkError. | 1620 EXPECT_EQ(1, ping_items[1].diff_error_category); // kNetworkError. |
1619 EXPECT_EQ(-1, ping_items[1].diff_error_code); | 1621 EXPECT_EQ(-1, ping_items[1].diff_error_code); |
1620 } | 1622 } |
1621 }; | 1623 }; |
1622 | 1624 |
1623 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); | 1625 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); |
1624 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 1626 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
1625 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 1627 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
1626 &FakeCrxDownloader::Create)); | 1628 &FakeCrxDownloader::Create)); |
1627 | 1629 |
1628 MockObserver observer; | 1630 MockObserver observer; |
1629 { | 1631 { |
1630 InSequence seq; | 1632 InSequence seq; |
1631 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 1633 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
1632 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); | 1634 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); |
1633 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, | 1635 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_FOUND, |
1634 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); | 1636 "ihfokbkgjpifnbbojhneepfflplebdkc")).Times(1); |
1635 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, | 1637 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_UPDATE_DOWNLOADING, |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1728 public: | 1730 public: |
1729 static scoped_ptr<CrxDownloader> Create( | 1731 static scoped_ptr<CrxDownloader> Create( |
1730 bool is_background_download, | 1732 bool is_background_download, |
1731 net::URLRequestContextGetter* context_getter, | 1733 net::URLRequestContextGetter* context_getter, |
1732 const scoped_refptr<base::SequencedTaskRunner>& | 1734 const scoped_refptr<base::SequencedTaskRunner>& |
1733 url_fetcher_task_runner) { | 1735 url_fetcher_task_runner) { |
1734 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 1736 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
1735 } | 1737 } |
1736 | 1738 |
1737 private: | 1739 private: |
1738 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 1740 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
1739 ~FakeCrxDownloader() override {} | 1741 ~FakeCrxDownloader() override {} |
1740 | 1742 |
1741 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } | 1743 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } |
1742 }; | 1744 }; |
1743 | 1745 |
1744 class FakePingManager : public FakePingManagerImpl { | 1746 class FakePingManager : public FakePingManagerImpl { |
1745 public: | 1747 public: |
1746 explicit FakePingManager(const Configurator& config) | 1748 explicit FakePingManager(const Configurator& config) |
1747 : FakePingManagerImpl(config) {} | 1749 : FakePingManagerImpl(config) {} |
1748 ~FakePingManager() override { EXPECT_TRUE(items().empty()); } | 1750 ~FakePingManager() override { EXPECT_TRUE(items().empty()); } |
1749 }; | 1751 }; |
1750 | 1752 |
1751 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); | 1753 scoped_ptr<PingManager> ping_manager(new FakePingManager(*config())); |
1752 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 1754 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
1753 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 1755 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
1754 &FakeCrxDownloader::Create)); | 1756 &FakeCrxDownloader::Create)); |
1755 | 1757 |
1756 MockObserver observer; | 1758 MockObserver observer; |
1757 InSequence seq; | 1759 InSequence seq; |
1758 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 1760 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
1759 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 1761 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
1760 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_NOT_UPDATED, | 1762 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_NOT_UPDATED, |
1761 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 1763 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
1762 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 1764 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
1763 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); | 1765 "jebgalgnebhfojomionfpkfelancnnkf")).Times(1); |
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1857 public: | 1859 public: |
1858 static scoped_ptr<CrxDownloader> Create( | 1860 static scoped_ptr<CrxDownloader> Create( |
1859 bool is_background_download, | 1861 bool is_background_download, |
1860 net::URLRequestContextGetter* context_getter, | 1862 net::URLRequestContextGetter* context_getter, |
1861 const scoped_refptr<base::SequencedTaskRunner>& | 1863 const scoped_refptr<base::SequencedTaskRunner>& |
1862 url_fetcher_task_runner) { | 1864 url_fetcher_task_runner) { |
1863 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 1865 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
1864 } | 1866 } |
1865 | 1867 |
1866 private: | 1868 private: |
1867 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 1869 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
1868 ~FakeCrxDownloader() override {} | 1870 ~FakeCrxDownloader() override {} |
1869 | 1871 |
1870 void DoStartDownload(const GURL& url) override { | 1872 void DoStartDownload(const GURL& url) override { |
1871 DownloadMetrics download_metrics; | 1873 DownloadMetrics download_metrics; |
1872 FilePath path; | 1874 FilePath path; |
1873 Result result; | 1875 Result result; |
1874 if (url.path() == "/download/jebgalgnebhfojomionfpkfelancnnkf.crx") { | 1876 if (url.path() == "/download/jebgalgnebhfojomionfpkfelancnnkf.crx") { |
1875 download_metrics.url = url; | 1877 download_metrics.url = url; |
1876 download_metrics.downloader = DownloadMetrics::kNone; | 1878 download_metrics.downloader = DownloadMetrics::kNone; |
1877 download_metrics.error = 0; | 1879 download_metrics.error = 0; |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1911 EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id); | 1913 EXPECT_EQ("jebgalgnebhfojomionfpkfelancnnkf", ping_items[0].id); |
1912 EXPECT_TRUE(base::Version("0.0").Equals(ping_items[0].previous_version)); | 1914 EXPECT_TRUE(base::Version("0.0").Equals(ping_items[0].previous_version)); |
1913 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version)); | 1915 EXPECT_TRUE(base::Version("1.0").Equals(ping_items[0].next_version)); |
1914 EXPECT_EQ(0, ping_items[0].error_category); | 1916 EXPECT_EQ(0, ping_items[0].error_category); |
1915 EXPECT_EQ(0, ping_items[0].error_code); | 1917 EXPECT_EQ(0, ping_items[0].error_code); |
1916 } | 1918 } |
1917 }; | 1919 }; |
1918 | 1920 |
1919 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); | 1921 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); |
1920 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 1922 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
1921 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 1923 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
1922 &FakeCrxDownloader::Create)); | 1924 &FakeCrxDownloader::Create)); |
1923 | 1925 |
1924 // Verify that calling Install sets ondemand. | 1926 // Verify that calling Install sets ondemand. |
1925 OnDemandTester ondemand_tester(update_client, true); | 1927 OnDemandTester ondemand_tester(update_client, true); |
1926 | 1928 |
1927 MockObserver observer; | 1929 MockObserver observer; |
1928 ON_CALL(observer, OnEvent(_, _)) | 1930 ON_CALL(observer, OnEvent(_, _)) |
1929 .WillByDefault(Invoke(&ondemand_tester, &OnDemandTester::CheckOnDemand)); | 1931 .WillByDefault(Invoke(&ondemand_tester, &OnDemandTester::CheckOnDemand)); |
1930 | 1932 |
1931 InSequence seq; | 1933 InSequence seq; |
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2008 public: | 2010 public: |
2009 static scoped_ptr<CrxDownloader> Create( | 2011 static scoped_ptr<CrxDownloader> Create( |
2010 bool is_background_download, | 2012 bool is_background_download, |
2011 net::URLRequestContextGetter* context_getter, | 2013 net::URLRequestContextGetter* context_getter, |
2012 const scoped_refptr<base::SequencedTaskRunner>& | 2014 const scoped_refptr<base::SequencedTaskRunner>& |
2013 url_fetcher_task_runner) { | 2015 url_fetcher_task_runner) { |
2014 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 2016 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
2015 } | 2017 } |
2016 | 2018 |
2017 private: | 2019 private: |
2018 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 2020 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
2019 ~FakeCrxDownloader() override {} | 2021 ~FakeCrxDownloader() override {} |
2020 | 2022 |
2021 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } | 2023 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } |
2022 }; | 2024 }; |
2023 | 2025 |
2024 class FakePingManager : public FakePingManagerImpl { | 2026 class FakePingManager : public FakePingManagerImpl { |
2025 public: | 2027 public: |
2026 explicit FakePingManager(const Configurator& config) | 2028 explicit FakePingManager(const Configurator& config) |
2027 : FakePingManagerImpl(config) {} | 2029 : FakePingManagerImpl(config) {} |
2028 ~FakePingManager() override { EXPECT_TRUE(items().empty()); } | 2030 ~FakePingManager() override { EXPECT_TRUE(items().empty()); } |
2029 }; | 2031 }; |
2030 | 2032 |
2031 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); | 2033 scoped_ptr<FakePingManager> ping_manager(new FakePingManager(*config())); |
2032 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 2034 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
2033 config(), ping_manager.Pass(), &FakeUpdateChecker::Create, | 2035 config(), std::move(ping_manager), &FakeUpdateChecker::Create, |
2034 &FakeCrxDownloader::Create)); | 2036 &FakeCrxDownloader::Create)); |
2035 | 2037 |
2036 // Verify that calling Install sets ondemand. | 2038 // Verify that calling Install sets ondemand. |
2037 OnDemandTester ondemand_tester(update_client, true); | 2039 OnDemandTester ondemand_tester(update_client, true); |
2038 | 2040 |
2039 MockObserver observer; | 2041 MockObserver observer; |
2040 ON_CALL(observer, OnEvent(_, _)) | 2042 ON_CALL(observer, OnEvent(_, _)) |
2041 .WillByDefault(Invoke(&ondemand_tester, &OnDemandTester::CheckOnDemand)); | 2043 .WillByDefault(Invoke(&ondemand_tester, &OnDemandTester::CheckOnDemand)); |
2042 | 2044 |
2043 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, | 2045 EXPECT_CALL(observer, OnEvent(Events::COMPONENT_CHECKING_FOR_UPDATES, |
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2097 public: | 2099 public: |
2098 static scoped_ptr<CrxDownloader> Create( | 2100 static scoped_ptr<CrxDownloader> Create( |
2099 bool is_background_download, | 2101 bool is_background_download, |
2100 net::URLRequestContextGetter* context_getter, | 2102 net::URLRequestContextGetter* context_getter, |
2101 const scoped_refptr<base::SequencedTaskRunner>& | 2103 const scoped_refptr<base::SequencedTaskRunner>& |
2102 url_fetcher_task_runner) { | 2104 url_fetcher_task_runner) { |
2103 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); | 2105 return scoped_ptr<CrxDownloader>(new FakeCrxDownloader()); |
2104 } | 2106 } |
2105 | 2107 |
2106 private: | 2108 private: |
2107 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>().Pass()) {} | 2109 FakeCrxDownloader() : CrxDownloader(scoped_ptr<CrxDownloader>()) {} |
2108 ~FakeCrxDownloader() override {} | 2110 ~FakeCrxDownloader() override {} |
2109 | 2111 |
2110 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } | 2112 void DoStartDownload(const GURL& url) override { EXPECT_TRUE(false); } |
2111 }; | 2113 }; |
2112 | 2114 |
2113 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( | 2115 scoped_refptr<UpdateClient> update_client(new UpdateClientImpl( |
2114 config(), make_scoped_ptr(new FakePingManagerImpl(*config())), | 2116 config(), make_scoped_ptr(new FakePingManagerImpl(*config())), |
2115 &FakeUpdateChecker::Create, &FakeCrxDownloader::Create)); | 2117 &FakeUpdateChecker::Create, &FakeCrxDownloader::Create)); |
2116 | 2118 |
2117 std::vector<std::string> empty_id_list; | 2119 std::vector<std::string> empty_id_list; |
2118 base::RunLoop runloop; | 2120 base::RunLoop runloop; |
2119 update_client->Update( | 2121 update_client->Update( |
2120 empty_id_list, base::Bind(&DataCallbackFake::Callback), | 2122 empty_id_list, base::Bind(&DataCallbackFake::Callback), |
2121 base::Bind(&CompletionCallbackFake::Callback, runloop.QuitClosure())); | 2123 base::Bind(&CompletionCallbackFake::Callback, runloop.QuitClosure())); |
2122 runloop.Run(); | 2124 runloop.Run(); |
2123 } | 2125 } |
2124 | 2126 |
2125 } // namespace update_client | 2127 } // namespace update_client |
OLD | NEW |