diff options
author | skyostil <skyostil@chromium.org> | 2015-06-05 12:53:07 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-06-05 19:53:37 +0000 |
commit | 95082a6a47108c4e20a77cc224172a293065ab05 (patch) | |
tree | c34e72f82cf4742097c92a500fabd9af0f251cef /content/browser/indexed_db/indexed_db_browsertest.cc | |
parent | 4e95f763c7f52664c94373b7d9fcc0ed96c7f019 (diff) | |
download | chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.zip chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.tar.gz chromium_src-95082a6a47108c4e20a77cc224172a293065ab05.tar.bz2 |
content: Remove use of MessageLoopProxy and deprecated MessageLoop APIs
This patch was mostly autogenerated with
https://codereview.chromium.org/1010073002/.
BUG=465354
TBR=nick@chromium.org
Committed: https://crrev.com/422456f9d53f0bf936a64f21a1463fd0abd3df84
Cr-Commit-Position: refs/heads/master@{#333081}
Review URL: https://codereview.chromium.org/1159623009
Cr-Commit-Position: refs/heads/master@{#333112}
Diffstat (limited to 'content/browser/indexed_db/indexed_db_browsertest.cc')
-rw-r--r-- | content/browser/indexed_db/indexed_db_browsertest.cc | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/content/browser/indexed_db/indexed_db_browsertest.cc b/content/browser/indexed_db/indexed_db_browsertest.cc index 2ab58c2..cf5b049 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()); } |