[Offline pages] Remove references to MessageLoop from components/offline_pages

components/offline_pages/offline_page_metadata_store_impl_unittest.cc

 // Copyright 2015 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 "components/offline_pages/offline_page_metadata_store_impl.h"
 
 #include "base/bind.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
-#include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
+#include "base/test/test_simple_task_runner.h"
+#include "base/thread_task_runner_handle.h"
 #include "components/leveldb_proto/proto_database_impl.h"
 #include "components/offline_pages/offline_page_item.h"
 #include "components/offline_pages/proto/offline_pages.pb.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using leveldb_proto::ProtoDatabaseImpl;
 
 namespace offline_pages {
 
 namespace {
 
 const char kTestURL[] = "https://example.com";
 const int64 kTestBookmarkId = 1234LL;
 const base::FilePath::CharType kFilePath[] =
     FILE_PATH_LITERAL("/offline_pages/example_com.mhtml");
 int64 kFileSize = 234567;
 
 class OfflinePageMetadataStoreImplTest : public testing::Test {
  public:
   enum CalledCallback { NONE, LOAD, ADD, REMOVE, DESTROY };
   enum Status { STATUS_NONE, STATUS_TRUE, STATUS_FALSE };
 
   OfflinePageMetadataStoreImplTest();
   ~OfflinePageMetadataStoreImplTest() override;
 
-  void TearDown() override { message_loop_.RunUntilIdle(); }
+  void TearDown() override { task_runner_->RunUntilIdle(); }

[jianli, 2015/12/08 23:25:25]

Is this needed now? If yes, call PumpLoop instead.

[fgorski, 2015/12/08 23:39:14]

Done. This is needed for the lsan tests. We have to wait for the level_db store
to delete itself. Added a comment.

 
   scoped_ptr<OfflinePageMetadataStoreImpl> BuildStore();
   void PumpLoop();
 
   void LoadCallback(OfflinePageMetadataStore::LoadStatus load_status,
                     const std::vector<OfflinePageItem>& offline_pages);
   void UpdateCallback(CalledCallback called_callback, bool success);
 
   void ClearResults();
 
  protected:
   CalledCallback last_called_callback_;
   Status last_status_;
   std::vector<OfflinePageItem> offline_pages_;
 
   base::ScopedTempDir temp_directory_;
-  base::MessageLoop message_loop_;
-  scoped_ptr<base::RunLoop> run_loop_;
+  scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
+  base::ThreadTaskRunnerHandle task_runner_handle_;
 };
 
 OfflinePageMetadataStoreImplTest::OfflinePageMetadataStoreImplTest()
-    : last_called_callback_(NONE), last_status_(STATUS_NONE) {
+    : last_called_callback_(NONE),
+      last_status_(STATUS_NONE),
+      task_runner_(new base::TestSimpleTaskRunner),
+      task_runner_handle_(task_runner_) {
   EXPECT_TRUE(temp_directory_.CreateUniqueTempDir());
 }
 
 OfflinePageMetadataStoreImplTest::~OfflinePageMetadataStoreImplTest() {
 }
 
 void OfflinePageMetadataStoreImplTest::PumpLoop() {
-  base::RunLoop().RunUntilIdle();
+  task_runner_->RunUntilIdle();
 }
 
 scoped_ptr<OfflinePageMetadataStoreImpl>
 OfflinePageMetadataStoreImplTest::BuildStore() {
   scoped_ptr<OfflinePageMetadataStoreImpl> store(
-      new OfflinePageMetadataStoreImpl(message_loop_.task_runner(),
+      new OfflinePageMetadataStoreImpl(base::ThreadTaskRunnerHandle::Get(),
                                        temp_directory_.path()));
   store->Load(base::Bind(&OfflinePageMetadataStoreImplTest::LoadCallback,
                          base::Unretained(this)));
   PumpLoop();
   return store.Pass();
 }
 
 void OfflinePageMetadataStoreImplTest::LoadCallback(
     OfflinePageMetadataStore::LoadStatus load_status,
     const std::vector<OfflinePageItem>& offline_pages) {
@@ skipping 247 matching lines @@
   EXPECT_EQ(offline_page.file_path, offline_pages_[0].file_path);
   EXPECT_EQ(offline_page.file_size, offline_pages_[0].file_size);
   EXPECT_EQ(offline_page.creation_time, offline_pages_[0].creation_time);
   EXPECT_EQ(offline_page.last_access_time, offline_pages_[0].last_access_time);
   EXPECT_EQ(offline_page.access_count, offline_pages_[0].access_count);
 }
 
 }  // namespace
 
 }  // namespace offline_pages