Have Storage tests check resources.

The tests were unstable before, now we only check resources
at the test fixture tear down, not upon every storage reset
(some uploads may still be ongoing at that time).

Bug: b:159361496
Change-Id: Iec90ca2c994a019abfc66cfb70dee77b2ce627f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2641087
Commit-Queue: Leonid Baraz <lbaraz@chromium.org>
Reviewed-by: Zach Trudo <zatrudo@google.com>
Cr-Commit-Position: refs/heads/master@{#845481}

chrome/browser/policy/messaging_layer/storage/storage_queue_unittest.cc

@@ -17,6 +17,7 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/test/task_environment.h"
 #include "chrome/browser/policy/messaging_layer/encryption/test_encryption_module.h"
+#include "chrome/browser/policy/messaging_layer/storage/resources/resource_interface.h"
 #include "chrome/browser/policy/messaging_layer/storage/storage_configuration.h"
 #include "chrome/browser/policy/messaging_layer/util/status.h"
 #include "chrome/browser/policy/messaging_layer/util/statusor.h"
@@ -268,6 +269,12 @@ class StorageQueueTest : public ::testing::TestWithParam<size_t> {
         .set_single_file_size(GetParam());
   }
 
+  void TearDown() override {
+    ResetTestStorageQueue();
+    // Make sure all memory is deallocated.
+    ASSERT_THAT(GetMemoryResource()->GetUsed(), Eq(0u));
+  }
+
   void CreateTestStorageQueueOrDie(const QueueOptions& options) {
     ASSERT_FALSE(storage_queue_) << "StorageQueue already assigned";
     test_encryption_module_ =

chrome/browser/policy/messaging_layer/storage/storage_unittest.cc

@@ -18,6 +18,7 @@
 #include "chrome/browser/policy/messaging_layer/encryption/decryption.h"
 #include "chrome/browser/policy/messaging_layer/encryption/encryption.h"
 #include "chrome/browser/policy/messaging_layer/encryption/test_encryption_module.h"
+#include "chrome/browser/policy/messaging_layer/storage/resources/resource_interface.h"
 #include "chrome/browser/policy/messaging_layer/storage/storage_configuration.h"
 #include "chrome/browser/policy/messaging_layer/util/status.h"
 #include "chrome/browser/policy/messaging_layer/util/status_macros.h"
@@ -448,7 +449,11 @@ class StorageTest
     }
   }
 
-  void TearDown() override { ResetTestStorage(); }
+  void TearDown() override {
+    ResetTestStorage();
+    // Make sure all memory is deallocated.
+    ASSERT_THAT(GetMemoryResource()->GetUsed(), Eq(0u));
+  }
 
   StatusOr<scoped_refptr<Storage>> CreateTestStorage(
       const StorageOptions& options,