diff options
3 files changed, 12 insertions, 12 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc index 27926db..2233334 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc @@ -132,7 +132,7 @@ class PhishingClassifierTest : public RenderViewFakeResourcesTest { ClientPhishingRequest verdict_; }; -TEST_F(PhishingClassifierTest, TestClassification) { +TEST_F(PhishingClassifierTest, DISABLED_TestClassification) { // No scorer yet, so the classifier is not ready. EXPECT_FALSE(classifier_->is_ready()); diff --git a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc index 5ec102d..7390400 100644 --- a/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_classifier_delegate_browsertest.cc @@ -98,7 +98,7 @@ class PhishingClassifierDelegateTest : public RenderViewFakeResourcesTest { scoped_ptr<ClientPhishingRequest> verdict_; }; -TEST_F(PhishingClassifierDelegateTest, Navigation) { +TEST_F(PhishingClassifierDelegateTest, DISABLED_Navigation) { MockPhishingClassifier* classifier = new StrictMock<MockPhishingClassifier>(view()); PhishingClassifierDelegate* delegate = @@ -259,7 +259,7 @@ TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer) { EXPECT_CALL(*classifier, CancelPendingClassification()); } -TEST_F(PhishingClassifierDelegateTest, NoScorer_Ref) { +TEST_F(PhishingClassifierDelegateTest, DISABLED_NoScorer_Ref) { // Similar to the last test, but navigates within the page before // setting the scorer. MockPhishingClassifier* classifier = @@ -291,7 +291,7 @@ TEST_F(PhishingClassifierDelegateTest, NoScorer_Ref) { EXPECT_CALL(*classifier, CancelPendingClassification()); } -TEST_F(PhishingClassifierDelegateTest, NoStartPhishingDetection) { +TEST_F(PhishingClassifierDelegateTest, DISABLED_NoStartPhishingDetection) { // Tests the behavior when OnStartPhishingDetection has not yet been called // when the page load finishes. MockPhishingClassifier* classifier = @@ -364,7 +364,7 @@ TEST_F(PhishingClassifierDelegateTest, NoStartPhishingDetection) { EXPECT_CALL(*classifier, CancelPendingClassification()); } -TEST_F(PhishingClassifierDelegateTest, IgnorePreliminaryCapture) { +TEST_F(PhishingClassifierDelegateTest, DISABLED_IgnorePreliminaryCapture) { // Tests that preliminary PageCaptured notifications are ignored. MockPhishingClassifier* classifier = new StrictMock<MockPhishingClassifier>(view()); @@ -396,7 +396,7 @@ TEST_F(PhishingClassifierDelegateTest, IgnorePreliminaryCapture) { EXPECT_CALL(*classifier, CancelPendingClassification()); } -TEST_F(PhishingClassifierDelegateTest, DuplicatePageCapture) { +TEST_F(PhishingClassifierDelegateTest, DISABLED_DuplicatePageCapture) { // Tests that a second PageCaptured notification causes classification to // be cancelled. MockPhishingClassifier* classifier = @@ -430,7 +430,7 @@ TEST_F(PhishingClassifierDelegateTest, DuplicatePageCapture) { EXPECT_CALL(*classifier, CancelPendingClassification()); } -TEST_F(PhishingClassifierDelegateTest, PhishingDetectionDone) { +TEST_F(PhishingClassifierDelegateTest, DISABLED_PhishingDetectionDone) { // Tests that a PhishingDetectionDone IPC is sent to the browser // whenever we finish classification. MockPhishingClassifier* classifier = diff --git a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc index aee8a38..47cf1f4 100644 --- a/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_dom_feature_extractor_browsertest.cc @@ -91,7 +91,7 @@ class PhishingDOMFeatureExtractorTest : public RenderViewFakeResourcesTest { base::WeakPtrFactory<PhishingDOMFeatureExtractorTest> weak_factory_; }; -TEST_F(PhishingDOMFeatureExtractorTest, FormFeatures) { +TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_FormFeatures) { // This test doesn't exercise the extraction timing. EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now())); responses_["http://host.com/"] = @@ -149,7 +149,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, FormFeatures) { EXPECT_THAT(features.features(), ContainerEq(expected_features.features())); } -TEST_F(PhishingDOMFeatureExtractorTest, LinkFeatures) { +TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_LinkFeatures) { // This test doesn't exercise the extraction timing. EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now())); responses_["http://www.host.com/"] = @@ -191,7 +191,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, LinkFeatures) { EXPECT_THAT(features.features(), ContainerEq(expected_features.features())); } -TEST_F(PhishingDOMFeatureExtractorTest, ScriptAndImageFeatures) { +TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_ScriptAndImageFeatures) { // This test doesn't exercise the extraction timing. EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now())); responses_["http://host.com/"] = @@ -222,7 +222,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, ScriptAndImageFeatures) { EXPECT_THAT(features.features(), ContainerEq(expected_features.features())); } -TEST_F(PhishingDOMFeatureExtractorTest, SubFrames) { +TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_SubFrames) { // This test doesn't exercise the extraction timing. EXPECT_CALL(clock_, Now()).WillRepeatedly(Return(base::TimeTicks::Now())); @@ -357,7 +357,7 @@ TEST_F(PhishingDOMFeatureExtractorTest, Continuation) { EXPECT_FALSE(ExtractFeatures(&features)); } -TEST_F(PhishingDOMFeatureExtractorTest, SubframeRemoval) { +TEST_F(PhishingDOMFeatureExtractorTest, DISABLED_SubframeRemoval) { // In this test, we'll advance the feature extractor so that it is positioned // inside an iframe, and have it pause due to exceeding the chunk time limit. // Then, prior to continuation, the iframe is removed from the document. |