SafeBrowsing: Track and cancel API checks.

components/safe_browsing_db/database_manager_unittest.cc

Index: components/safe_browsing_db/database_manager_unittest.cc
diff --git a/components/safe_browsing_db/database_manager_unittest.cc b/components/safe_browsing_db/database_manager_unittest.cc
index c914a08e3beb4c7d74d6dc387cfdf938639af6ba..1c32f6e6df610b7ead85c30b4dde260310d7cbbe 100644
--- a/components/safe_browsing_db/database_manager_unittest.cc
+++ b/components/safe_browsing_db/database_manager_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/safe_browsing_db/test_database_manager.h"
@@ -25,6 +26,12 @@ namespace safe_browsing {
 
 namespace {
 
+void InvokeFullHashCallback(
+    V4GetHashProtocolManager::FullHashCallback callback,
+    const std::vector<SBFullHashResult>& full_hashes) {
+  callback.Run(full_hashes, base::TimeDelta::FromMinutes(0));
+}
+
 // A TestV4GetHashProtocolManager that returns fixed responses from the
 // Safe Browsing server for testing purpose.
 class TestV4GetHashProtocolManager : public V4GetHashProtocolManager {
@@ -32,14 +39,21 @@ class TestV4GetHashProtocolManager : public V4GetHashProtocolManager {
   TestV4GetHashProtocolManager(
       net::URLRequestContextGetter* request_context_getter,
       const V4ProtocolConfig& config)
-      : V4GetHashProtocolManager(request_context_getter, config) {}
+      : V4GetHashProtocolManager(request_context_getter, config),
+        delay_seconds_(0) {}
 
   ~TestV4GetHashProtocolManager() override {}
 
   void GetFullHashesWithApis(const std::vector<SBPrefix>& prefixes,
                              FullHashCallback callback) override {
     prefixes_ = prefixes;
-    callback.Run(full_hashes_, base::TimeDelta::FromMinutes(0));
+    base::MessageLoop::current()->PostDelayedTask(
+        FROM_HERE, base::Bind(InvokeFullHashCallback, callback, full_hashes_),
+        base::TimeDelta::FromSeconds(delay_seconds_));

[Nathan Parker, 2016/04/19 18:05:19]

Does this use real time, or just ensure the ordering of tasks (real time delays
in test are generally unreliable.)

[kcarattini, 2016/04/20 01:55:53]

I'm not sure. It doesn't appear to use real time because I set a rather long
delay and the test does not take that long to run. Would you suggest a different
way of doing this?

+  }
+
+  void SetDelaySeconds(int delay) {
+    delay_seconds_ = delay;
   }
 
   // Prepare the GetFullHash results for the next request.
@@ -53,6 +67,7 @@ class TestV4GetHashProtocolManager : public V4GetHashProtocolManager {
  private:
   std::vector<SBPrefix> prefixes_;
   std::vector<SBFullHashResult> full_hashes_;
+  int delay_seconds_;
 };
 
 // Factory that creates test protocol manager instances.
@@ -130,6 +145,7 @@ TEST_F(SafeBrowsingDatabaseManagerTest, CheckApiBlacklistUrlPrefixes) {
       {1237562338, 2871045197, 3553205461, 3766933875};
 
   EXPECT_FALSE(db_manager_->CheckApiBlacklistUrl(url, &client));
+  base::RunLoop().RunUntilIdle();
   std::vector<SBPrefix> prefixes = static_cast<TestV4GetHashProtocolManager*>(
       db_manager_->v4_get_hash_protocol_manager_)->GetRequestPrefixes();
   EXPECT_EQ(expected_prefixes.size(), prefixes.size());
@@ -200,4 +216,23 @@ TEST_F(SafeBrowsingDatabaseManagerTest, HandleGetHashesWithApisResultsMatches) {
   EXPECT_EQ("NOTIFICATIONS", permissions[1]);
 }
 
+TEST_F(SafeBrowsingDatabaseManagerTest, CancelApiCheck) {
+  TestClient client;
+  const GURL url("https://www.example.com/more");
+  TestV4GetHashProtocolManager* pm = static_cast<TestV4GetHashProtocolManager*>(
+      db_manager_->v4_get_hash_protocol_manager_);
+  SBFullHashResult full_hash_result;
+  full_hash_result.hash = SBFullHashForString("example.com/");
+  full_hash_result.metadata.api_permissions.push_back("GEOLOCATION");
+  pm->AddGetFullHashResponse(full_hash_result);
+  pm->SetDelaySeconds(100);
+
+  EXPECT_FALSE(db_manager_->CheckApiBlacklistUrl(url, &client));
+  EXPECT_TRUE(db_manager_->CancelApiCheck(&client));
+  base::RunLoop().RunUntilIdle();
+
+  const std::vector<std::string>& permissions = client.GetBlockedPermissions();
+  EXPECT_EQ(0ul, permissions.size());

[Nathan Parker, 2016/04/19 18:05:19]

Does this verify that the callback was invoked?

[kcarattini, 2016/04/20 01:55:53]

No. How would I do that?

[Nathan Parker, 2016/04/20 03:03:35]

You could do something like set a "was_callback_invoked_" bool in
OnCheckApiBlacklistUrlResult() of the client. 

[kcarattini, 2016/04/20 04:44:01]

Oh, that callback. Done.

+}
+
 }  // namespace safe_browsing