Salient parts of http://codereview.chromium.org/8392042/

content/browser/in_process_webkit/indexed_db_quota_client_unittest.cc

 // Copyright (c) 2011 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 <map>
 
 #include "base/bind.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_callback_factory.h"
 #include "base/message_loop.h"
 #include "base/message_loop_proxy.h"
 #include "base/scoped_temp_dir.h"
 #include "content/browser/in_process_webkit/indexed_db_context.h"
 #include "content/browser/in_process_webkit/indexed_db_quota_client.h"
 #include "content/browser/in_process_webkit/webkit_context.h"
 #include "content/test/test_browser_context.h"
+#include "content/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/database/database_util.h"
 
 // Declared to shorten the line lengths.
 static const quota::StorageType kTemp = quota::kStorageTypeTemporary;
 static const quota::StorageType kPerm = quota::kStorageTypePersistent;
 
 using namespace webkit_database;
 
 // Base class for our test fixtures.
@@ skipping 118 matching lines @@
     delete_status_ = code;
   }
 
   ScopedTempDir temp_dir_;
   int64 usage_;
   std::set<GURL> origins_;
   quota::StorageType type_;
   scoped_refptr<IndexedDBContext> idb_context_;
   base::WeakPtrFactory<IndexedDBQuotaClientTest> weak_factory_;
   MessageLoop message_loop_;
-  BrowserThread webkit_thread_;
-  BrowserThread io_thread_;
+  content::TestBrowserThread webkit_thread_;
+  content::TestBrowserThread io_thread_;
   quota::QuotaStatusCode delete_status_;
 };
 
 
 TEST_F(IndexedDBQuotaClientTest, GetOriginUsage) {
   IndexedDBQuotaClient client(
       base::MessageLoopProxy::current(),
       idb_context());
 
   AddFakeIndexedDB(kOriginA, 6);
@@ skipping 60 matching lines @@
   AddFakeIndexedDB(kOriginA, 1000);
   AddFakeIndexedDB(kOriginB, 50);
   EXPECT_EQ(1000, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 
   quota::QuotaStatusCode delete_status = DeleteOrigin(&client, kOriginA);
   EXPECT_EQ(quota::kQuotaStatusOk, delete_status);
   EXPECT_EQ(0, GetOriginUsage(&client, kOriginA, kTemp));
   EXPECT_EQ(50, GetOriginUsage(&client, kOriginB, kTemp));
 }