Revert of Allow BlobDataHandles to be copied, and have their UUIDs read, on any thread.

content/browser/fileapi/blob_storage_context_unittest.cc

 // Copyright 2014 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/message_loop/message_loop.h"
-#include "base/run_loop.h"
 #include "base/time/time.h"
 #include "content/browser/fileapi/blob_storage_host.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/browser/blob/blob_data_handle.h"
 #include "webkit/browser/blob/blob_storage_context.h"
 
 using webkit_blob::BlobDataHandle;
 
 namespace content {
 
@@ skipping 15 matching lines @@
 
   // Build up a basic blob.
   const std::string kId("id");
   SetupBasicBlob(&host, kId);
 
   // Make sure it's there, finish building implies a ref of one.
   scoped_ptr<BlobDataHandle> blob_data_handle;
   blob_data_handle = context.GetBlobDataFromUUID(kId);
   EXPECT_TRUE(blob_data_handle);
   blob_data_handle.reset();
-  {  // Clean up for ASAN
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
 
   // Make sure its still there after inc/dec.
   EXPECT_TRUE(host.IncrementBlobRefCount(kId));
   EXPECT_TRUE(host.DecrementBlobRefCount(kId));
   blob_data_handle = context.GetBlobDataFromUUID(kId);
   EXPECT_TRUE(blob_data_handle);
   blob_data_handle.reset();
-  {  // Clean up for ASAN
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
 
   // Make sure it goes away in the end.
   EXPECT_TRUE(host.DecrementBlobRefCount(kId));
   blob_data_handle = context.GetBlobDataFromUUID(kId);
   EXPECT_FALSE(blob_data_handle);
   EXPECT_FALSE(host.DecrementBlobRefCount(kId));
   EXPECT_FALSE(host.IncrementBlobRefCount(kId));
 }
 
 TEST(BlobStorageContextTest, BlobDataHandle) {
@@ skipping 14 matching lines @@
   EXPECT_TRUE(host.DecrementBlobRefCount(kId));
 
   // Should still be there due to the handle.
   scoped_ptr<BlobDataHandle> another_handle =
       context.GetBlobDataFromUUID(kId);
   EXPECT_TRUE(another_handle);
 
   // Should disappear after dropping both handles.
   blob_data_handle.reset();
   another_handle.reset();
-  {  // Clean up for ASAN
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
   blob_data_handle = context.GetBlobDataFromUUID(kId);
   EXPECT_FALSE(blob_data_handle);
 }
 
 TEST(BlobStorageContextTest, CompoundBlobs) {
   const std::string kId1("id1");
   const std::string kId2("id2");
   const std::string kId2Prime("id2.prime");
 
   base::MessageLoop fake_io_message_loop;
@@ skipping 29 matching lines @@
 
   // Test a blob referring to only data and a file.
   blob_data_handle = context.AddFinishedBlob(blob_data1.get());
   ASSERT_TRUE(blob_data_handle.get());
   EXPECT_TRUE(*(blob_data_handle->data()) == *blob_data1.get());
 
   // Test a blob composed in part with another blob.
   blob_data_handle = context.AddFinishedBlob(blob_data2.get());
   ASSERT_TRUE(blob_data_handle.get());
   EXPECT_TRUE(*(blob_data_handle->data()) == *canonicalized_blob_data2.get());
-
-  blob_data_handle.reset();
-  {  // Clean up for ASAN
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
 }
 
 TEST(BlobStorageContextTest, PublicBlobUrls) {
   BlobStorageContext context;
   BlobStorageHost host(&context);
   base::MessageLoop fake_io_message_loop;
 
   // Build up a basic blob.
   const std::string kId("id");
   SetupBasicBlob(&host, kId);
 
   // Now register a url for that blob.
   GURL kUrl("blob:id");
   EXPECT_TRUE(host.RegisterPublicBlobURL(kUrl, kId));
   scoped_ptr<BlobDataHandle> blob_data_handle =
       context.GetBlobDataFromPublicURL(kUrl);
   ASSERT_TRUE(blob_data_handle.get());
   EXPECT_EQ(kId, blob_data_handle->data()->uuid());
   blob_data_handle.reset();
-  {  // Clean up for ASAN
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
 
   // The url registration should keep the blob alive even after
   // explicit references are dropped.
   EXPECT_TRUE(host.DecrementBlobRefCount(kId));
   blob_data_handle = context.GetBlobDataFromPublicURL(kUrl);
   EXPECT_TRUE(blob_data_handle);
   blob_data_handle.reset();
-  {  // Clean up for ASAN
-    base::RunLoop run_loop;
-    run_loop.RunUntilIdle();
-  }
 
   // Finally get rid of the url registration and the blob.
   EXPECT_TRUE(host.RevokePublicBlobURL(kUrl));
   blob_data_handle = context.GetBlobDataFromPublicURL(kUrl);
   EXPECT_TRUE(!blob_data_handle.get());
   EXPECT_FALSE(host.RevokePublicBlobURL(kUrl));
 }
 
 TEST(BlobStorageContextTest, HostCleanup) {
   BlobStorageContext context;
@@ skipping 31 matching lines @@
   EXPECT_FALSE(host.FinishBuildingBlob(kId, "text/plain"));
   EXPECT_FALSE(host.RegisterPublicBlobURL(kUrl, kId));
   EXPECT_FALSE(host.IncrementBlobRefCount(kId));
   EXPECT_FALSE(host.DecrementBlobRefCount(kId));
   EXPECT_FALSE(host.RevokePublicBlobURL(kUrl));
 }
 
 // TODO(michaeln): tests for the depcrecated url stuff
 
 }  // namespace content