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

Side by Side Diff: chrome/browser/extensions/content_verifier_browsertest.cc

Issue 2739823003: Disable ContentVerifierTest.FailOnDone and ContentVerifierTest.FailOnRead on Win 10 with PlzNavigat… (Closed)
Patch Set: Created 3 years, 9 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <list> 5 #include <list>
6 #include <set> 6 #include <set>
7 #include <string> 7 #include <string>
8 8
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback_helpers.h" 10 #include "base/callback_helpers.h"
11 #include "base/macros.h" 11 #include "base/macros.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "base/run_loop.h" 13 #include "base/run_loop.h"
14 #include "base/scoped_observer.h" 14 #include "base/scoped_observer.h"
15 #include "base/strings/string_split.h" 15 #include "base/strings/string_split.h"
16 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
17 #include "chrome/browser/extensions/browsertest_util.h" 17 #include "chrome/browser/extensions/browsertest_util.h"
18 #include "chrome/browser/extensions/chrome_content_verifier_delegate.h" 18 #include "chrome/browser/extensions/chrome_content_verifier_delegate.h"
19 #include "chrome/browser/extensions/extension_browsertest.h" 19 #include "chrome/browser/extensions/extension_browsertest.h"
20 #include "chrome/browser/extensions/extension_management_test_util.h" 20 #include "chrome/browser/extensions/extension_management_test_util.h"
21 #include "chrome/browser/extensions/extension_service.h" 21 #include "chrome/browser/extensions/extension_service.h"
22 #include "chrome/common/chrome_switches.h" 22 #include "chrome/common/chrome_switches.h"
23 #include "components/policy/core/browser/browser_policy_connector.h" 23 #include "components/policy/core/browser/browser_policy_connector.h"
24 #include "components/policy/core/common/mock_configuration_policy_provider.h" 24 #include "components/policy/core/common/mock_configuration_policy_provider.h"
25 #include "content/public/common/browser_side_navigation_policy.h"
25 #include "content/public/test/test_utils.h" 26 #include "content/public/test/test_utils.h"
26 #include "extensions/browser/content_verifier.h" 27 #include "extensions/browser/content_verifier.h"
27 #include "extensions/browser/content_verify_job.h" 28 #include "extensions/browser/content_verify_job.h"
28 #include "extensions/browser/crx_file_info.h" 29 #include "extensions/browser/crx_file_info.h"
29 #include "extensions/browser/extension_prefs.h" 30 #include "extensions/browser/extension_prefs.h"
30 #include "extensions/browser/extension_registry.h" 31 #include "extensions/browser/extension_registry.h"
31 #include "extensions/browser/extension_registry_observer.h" 32 #include "extensions/browser/extension_registry_observer.h"
32 #include "extensions/browser/external_install_info.h" 33 #include "extensions/browser/external_install_info.h"
33 #include "extensions/browser/external_provider_interface.h" 34 #include "extensions/browser/external_provider_interface.h"
34 #include "extensions/browser/management_policy.h" 35 #include "extensions/browser/management_policy.h"
35 #include "extensions/browser/updater/extension_downloader.h" 36 #include "extensions/browser/updater/extension_downloader.h"
36 #include "extensions/browser/updater/extension_downloader_test_delegate.h" 37 #include "extensions/browser/updater/extension_downloader_test_delegate.h"
37 #include "extensions/browser/updater/manifest_fetch_data.h" 38 #include "extensions/browser/updater/manifest_fetch_data.h"
38 #include "extensions/common/extension_urls.h" 39 #include "extensions/common/extension_urls.h"
39 40
41 #if defined(OS_WIN)
42 #include "base/win/windows_version.h"
43 #endif
44
40 namespace extensions { 45 namespace extensions {
41 46
42 namespace { 47 namespace {
43 48
44 // Helper for observing extension registry events. 49 // Helper for observing extension registry events.
45 class RegistryObserver : public ExtensionRegistryObserver { 50 class RegistryObserver : public ExtensionRegistryObserver {
46 public: 51 public:
47 explicit RegistryObserver(ExtensionRegistry* registry) : observer_(this) { 52 explicit RegistryObserver(ExtensionRegistry* registry) : observer_(this) {
48 observer_.Add(registry); 53 observer_.Add(registry);
49 } 54 }
(...skipping 443 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 unload_observer_.reset(); 498 unload_observer_.reset();
494 } 499 }
495 500
496 protected: 501 protected:
497 JobDelegate delegate_; 502 JobDelegate delegate_;
498 std::unique_ptr<RegistryObserver> unload_observer_; 503 std::unique_ptr<RegistryObserver> unload_observer_;
499 GURL page_url_; 504 GURL page_url_;
500 }; 505 };
501 506
502 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, FailOnRead) { 507 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, FailOnRead) {
508 #if defined(OS_WIN)
509 if (content::IsBrowserSideNavigationEnabled() &&
510 base::win::GetVersion() >= base::win::VERSION_WIN10) {
511 // http://crbug.com/699437
512 return;
513 }
514 #endif
503 EXPECT_EQ(0, delegate_.bytes_read_failed()); 515 EXPECT_EQ(0, delegate_.bytes_read_failed());
504 delegate_.fail_next_read(); 516 delegate_.fail_next_read();
505 OpenPageAndWaitForUnload(); 517 OpenPageAndWaitForUnload();
506 EXPECT_EQ(1, delegate_.bytes_read_failed()); 518 EXPECT_EQ(1, delegate_.bytes_read_failed());
507 } 519 }
508 520
509 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, FailOnDone) { 521 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, FailOnDone) {
522 #if defined(OS_WIN)
523 if (content::IsBrowserSideNavigationEnabled() &&
524 base::win::GetVersion() >= base::win::VERSION_WIN10) {
525 // http://crbug.com/699437
526 return;
527 }
528 #endif
510 EXPECT_EQ(0, delegate_.done_reading_failed()); 529 EXPECT_EQ(0, delegate_.done_reading_failed());
511 delegate_.fail_next_done(); 530 delegate_.fail_next_done();
512 OpenPageAndWaitForUnload(); 531 OpenPageAndWaitForUnload();
513 EXPECT_EQ(1, delegate_.done_reading_failed()); 532 EXPECT_EQ(1, delegate_.done_reading_failed());
514 } 533 }
515 534
516 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, DotSlashPaths) { 535 IN_PROC_BROWSER_TEST_F(ContentVerifierTest, DotSlashPaths) {
517 JobObserver job_observer; 536 JobObserver job_observer;
518 ContentVerifyJob::SetObserverForTests(&job_observer); 537 ContentVerifyJob::SetObserverForTests(&job_observer);
519 std::string id = "hoipipabpcoomfapcecilckodldhmpgl"; 538 std::string id = "hoipipabpcoomfapcecilckodldhmpgl";
(...skipping 288 matching lines...) Expand 10 before | Expand all | Expand 10 after
808 // Assert that the first reinstall action happened with a delay of 0, and 827 // Assert that the first reinstall action happened with a delay of 0, and
809 // then kept growing each additional time. 828 // then kept growing each additional time.
810 ASSERT_EQ(iterations, calls.size()); 829 ASSERT_EQ(iterations, calls.size());
811 EXPECT_EQ(base::TimeDelta(), delay_tracker.calls()[0]); 830 EXPECT_EQ(base::TimeDelta(), delay_tracker.calls()[0]);
812 for (size_t i = 1; i < delay_tracker.calls().size(); i++) { 831 for (size_t i = 1; i < delay_tracker.calls().size(); i++) {
813 EXPECT_LT(calls[i - 1], calls[i]); 832 EXPECT_LT(calls[i - 1], calls[i]);
814 } 833 }
815 } 834 }
816 835
817 } // namespace extensions 836 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698