[SafeBrowsing] Reset malware indicator on page nav start.

chrome/browser/safe_browsing/client_side_detection_host_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/stringprintf.h"
 #include "base/synchronization/waitable_event.h"
@@ skipping 30 matching lines @@
 using ::testing::Pointee;
 using ::testing::Return;
 using ::testing::SaveArg;
 using ::testing::SetArgumentPointee;
 using ::testing::StrictMock;
 using content::BrowserThread;
 using content::RenderViewHostTester;
 using content::WebContents;
 
 namespace {
+
 const bool kFalse = false;
 const bool kTrue = true;

[Greg Billock, 2013/12/13 21:10:55]

What's going with this?

[mattm, 2013/12/14 00:09:49]

I guess it's so ExpectPreClassificationChecks can have tri-state arguments by
passing NULL or a pointer to one of these (true, false, not-used).  Tis a bit
weird.

[Greg Billock, 2013/12/14 18:35:34]

ok

-}
+
+}  // namespace
 
 namespace safe_browsing {
 namespace {
 // This matcher verifies that the client computed verdict
 // (ClientPhishingRequest) which is passed to SendClientReportPhishingRequest
 // has the expected fields set.  Note: we can't simply compare the protocol
 // buffer strings because the BrowserFeatureExtractor might add features to the
 // verdict object before calling SendClientReportPhishingRequest.
 MATCHER_P(PartiallyEqualVerdict, other, "") {
   return (other.url() == arg.url() &&
@@ skipping 298 matching lines @@
     resource.url = url;
     resource.original_url = url;
     resource.is_subresource = false;
     resource.threat_type = SB_THREAT_TYPE_URL_MALWARE;
     resource.callback = base::Bind(&EmptyUrlCheckCallback);
     resource.render_process_host_id = pending_rvh()->GetProcess()->GetID();
     resource.render_view_id = pending_rvh()->GetRoutingID();
     csd_host_->OnSafeBrowsingMatch(resource);
     csd_host_->OnSafeBrowsingHit(resource);
     resource.callback.Reset();
 

[mattm, 2013/12/14 00:09:49]

test DidPageReceiveSafeBrowsingMatch() before committing the navigation too.

[Greg Billock, 2013/12/14 18:35:34]

Done.

     // LoadURL created a navigation entry, now simulate the RenderView sending
     // a notification that it actually navigated.
     content::WebContentsTester::For(web_contents())->CommitPendingNavigation();
 
     ASSERT_TRUE(csd_host_->DidPageReceiveSafeBrowsingMatch());

[mattm, 2013/12/14 00:09:49]

Add tests of DidPageReceiveSafeBrowsingMatch() for navigating away from malware
also (during the pending navigation, after committing it, and also after
cancelling it)

[mattm, 2013/12/14 00:12:28]

Also test of getting a match during a pending navigation and then cancelling the
navigation instead of committing it.

[Greg Billock, 2013/12/14 18:35:34]

Done.

[Greg Billock, 2013/12/14 18:35:34]

Done.

     ASSERT_TRUE(csd_host_->DidShowSBInterstitial());
     TestUnsafeResourceCopied(resource);
   }
 
   void CheckIPUrlEqual(const std::vector<IPUrlInfo>& expect,
                        const std::vector<IPUrlInfo>& result) {
     ASSERT_EQ(expect.size(), result.size());
 
     for (unsigned int i = 0; i < expect.size(); ++i) {
       EXPECT_EQ(expect[i].url, result[i].url);
@@ skipping 748 matching lines @@
   EXPECT_TRUE(Mock::VerifyAndClear(csd_host_.get()));
   EXPECT_TRUE(Mock::VerifyAndClear(ui_manager_.get()));
   EXPECT_EQ(url, resource.url);
   EXPECT_EQ(url, resource.original_url);
   resource.callback.Reset();
   msg = process()->sink().GetFirstMessageMatching(
       SafeBrowsingMsg_StartPhishingDetection::ID);
   ASSERT_FALSE(msg);
 }
 }  // namespace safe_browsing