Index: content/browser/indexed_db/indexed_db_browsertest.cc |
diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc |
index 2ab58c2cd2b03c4d114f1a578129bf5053549a94..cf5b049e059673225cab5f9eb8b0ba0dae044f9a 100644 |
--- a/content/browser/indexed_db/indexed_db_browsertest.cc |
+++ b/content/browser/indexed_db/indexed_db_browsertest.cc |
@@ -9,8 +9,9 @@ |
#include "base/files/file_path.h" |
#include "base/files/file_util.h" |
#include "base/lazy_instance.h" |
+#include "base/location.h" |
#include "base/memory/ref_counted.h" |
-#include "base/message_loop/message_loop.h" |
+#include "base/single_thread_task_runner.h" |
#include "base/strings/utf_string_conversions.h" |
#include "base/test/thread_test_helper.h" |
#include "content/browser/browser_main_loop.h" |
@@ -142,8 +143,7 @@ class IndexedDBBrowserTest : public ContentBrowserTest { |
GURL("file:///")), |
base::Bind(&IndexedDBBrowserTest::DidGetDiskUsage, this)); |
scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper( |
- BrowserMainLoop::GetInstance()->indexed_db_thread()-> |
- message_loop_proxy())); |
+ BrowserMainLoop::GetInstance()->indexed_db_thread()->task_runner())); |
EXPECT_TRUE(helper->Run()); |
// Wait for DidGetDiskUsage to be called. |
base::MessageLoop::current()->RunUntilIdle(); |
@@ -156,10 +156,8 @@ class IndexedDBBrowserTest : public ContentBrowserTest { |
base::Bind(&IndexedDBContextImpl::GetOriginBlobFileCount, GetContext(), |
GURL("file:///")), |
base::Bind(&IndexedDBBrowserTest::DidGetBlobFileCount, this)); |
- scoped_refptr<base::ThreadTestHelper> helper( |
- new base::ThreadTestHelper(BrowserMainLoop::GetInstance() |
- ->indexed_db_thread() |
- ->message_loop_proxy())); |
+ scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper( |
+ BrowserMainLoop::GetInstance()->indexed_db_thread()->task_runner())); |
EXPECT_TRUE(helper->Run()); |
// Wait for DidGetBlobFileCount to be called. |
base::MessageLoop::current()->RunUntilIdle(); |
@@ -323,8 +321,7 @@ class IndexedDBBrowserTestWithPreexistingLevelDB : public IndexedDBBrowserTest { |
base::Bind( |
&CopyLevelDBToProfile, shell(), context, EnclosingLevelDBDir())); |
scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper( |
- BrowserMainLoop::GetInstance()->indexed_db_thread()-> |
- message_loop_proxy())); |
+ BrowserMainLoop::GetInstance()->indexed_db_thread()->task_runner())); |
ASSERT_TRUE(helper->Run()); |
} |
@@ -477,10 +474,8 @@ IN_PROC_BROWSER_TEST_F(IndexedDBBrowserTest, DeleteForOriginDeletesBlobs) { |
GetContext()->TaskRunner()->PostTask( |
FROM_HERE, base::Bind(&IndexedDBContextImpl::DeleteForOrigin, |
GetContext(), GURL("file:///"))); |
- scoped_refptr<base::ThreadTestHelper> helper( |
- new base::ThreadTestHelper(BrowserMainLoop::GetInstance() |
- ->indexed_db_thread() |
- ->message_loop_proxy())); |
+ scoped_refptr<base::ThreadTestHelper> helper(new base::ThreadTestHelper( |
+ BrowserMainLoop::GetInstance()->indexed_db_thread()->task_runner())); |
ASSERT_TRUE(helper->Run()); |
EXPECT_EQ(0, RequestDiskUsage()); |
} |