Use content::TestBrowserThreadBundle in bookmark tests.

content::TestBrowserThreadBundle was introduced (in r204603) after these
bookmark tests were initially created. In addition to simplifying the
test code this class also has a more robust thread shutdown process.

Also, fixed a few minor issues identified by "git cl lint".

Review URL: https://codereview.chromium.org/1370513004

Cr-Commit-Position: refs/heads/master@{#350930}

6 files changed, 16 insertions, 61 deletions

diff --git a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
index 26bdb0c..0a2eab4 100644
--- a/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
+++ b/chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc
@@ -4,7 +4,6 @@
 
 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
 
-#include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -13,6 +12,7 @@
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
@@ -34,11 +34,7 @@ class MockObserver : public PartnerBookmarksShim::Observer {
 
 class PartnerBookmarksShimTest : public testing::Test {
  public:
-  PartnerBookmarksShimTest()
-      : ui_thread_(content::BrowserThread::UI, &message_loop_),
-        file_thread_(content::BrowserThread::FILE, &message_loop_),
-        model_(NULL) {
-  }
+  PartnerBookmarksShimTest() : model_(nullptr) {}
 
   TestingProfile* profile() const { return profile_.get(); }
   PartnerBookmarksShim* partner_bookmarks_shim() const {
@@ -79,13 +75,12 @@ class PartnerBookmarksShimTest : public testing::Test {
 
   scoped_ptr<TestingProfile> profile_;
 
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   BookmarkModel* model_;
   MockObserver observer_;
 
+ private:
   DISALLOW_COPY_AND_ASSIGN(PartnerBookmarksShimTest);
 };
 
diff --git a/chrome/browser/importer/profile_writer_unittest.cc b/chrome/browser/importer/profile_writer_unittest.cc
index 4eca839..74dd262 100644
--- a/chrome/browser/importer/profile_writer_unittest.cc
+++ b/chrome/browser/importer/profile_writer_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/history/history_service_factory.h"
@@ -19,12 +18,11 @@
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/history/core/browser/history_types.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using bookmarks::BookmarkMatch;
 using bookmarks::BookmarkModel;
-using content::BrowserThread;
 
 class TestProfileWriter : public ProfileWriter {
  public:
@@ -35,16 +33,9 @@ class TestProfileWriter : public ProfileWriter {
 
 class ProfileWriterTest : public testing::Test {
  public:
-  ProfileWriterTest()
-      : ui_thread_(BrowserThread::UI, &loop_),
-        file_thread_(BrowserThread::FILE, &loop_) {
-  }
+  ProfileWriterTest() {}
   ~ProfileWriterTest() override {}
 
-  void TearDown() override {
-    loop_.RunUntilIdle();
-  }
-
   // Create test bookmark entries to be added to ProfileWriter to
   // simulate bookmark importing.
   void CreateImportedBookmarksEntries() {
@@ -132,9 +123,7 @@ class ProfileWriterTest : public testing::Test {
     bookmarks_.push_back(entry);
   }
 
-  base::MessageLoop loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileWriterTest);
 };
diff --git a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
index 3908917..910679c 100644
--- a/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_bookmark_unittest.cc
@@ -15,7 +15,6 @@
 #include "base/files/file_path.h"
 #include "base/location.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
diff --git a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
index 6475732..ddc4dbb 100644
--- a/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
+++ b/chrome/browser/ui/bookmarks/bookmark_context_menu_controller_unittest.cc
@@ -7,7 +7,6 @@
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/app/chrome_command_ids.h"
@@ -22,6 +21,7 @@
 #include "components/syncable_prefs/testing_pref_service_syncable.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 
@@ -46,11 +46,7 @@ class TestingPageNavigator : public PageNavigator {
 
 class BookmarkContextMenuControllerTest : public testing::Test {
  public:
-  BookmarkContextMenuControllerTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_),
-        model_(NULL) {
-  }
+  BookmarkContextMenuControllerTest() : model_(nullptr) {}
 
   void SetUp() override {
     TestingProfile::Builder builder;
@@ -63,9 +59,6 @@ class BookmarkContextMenuControllerTest : public testing::Test {
 
   void TearDown() override {
     ui::Clipboard::DestroyClipboardForCurrentThread();
-
-    // Flush the message loop to make application verifiers happy.
-    message_loop_.RunUntilIdle();
   }
 
   // Creates the following structure:
@@ -93,9 +86,7 @@ class BookmarkContextMenuControllerTest : public testing::Test {
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   BookmarkModel* model_;
   TestingPageNavigator navigator_;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
index 6b63f94..f3a9d6e 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_context_menu_unittest.cc
@@ -25,6 +25,7 @@
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/events/platform/platform_event_source.h"
@@ -59,11 +60,7 @@ class TestingPageNavigator : public PageNavigator {
 
 class BookmarkContextMenuTest : public testing::Test {
  public:
-  BookmarkContextMenuTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_),
-        model_(NULL) {
-  }
+  BookmarkContextMenuTest() : model_(nullptr) {}
 
   void SetUp() override {
     profile_.reset(new TestingProfile());
@@ -79,14 +76,10 @@ class BookmarkContextMenuTest : public testing::Test {
     ui::Clipboard::DestroyClipboardForCurrentThread();
 
     BrowserThread::GetBlockingPool()->FlushForTesting();
-    // Flush the message loop to make application verifiers happy.
-    message_loop_.RunUntilIdle();
   }
 
  protected:
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfile> profile_;
   BookmarkModel* model_;
   TestingPageNavigator navigator_;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
index bd6d4a8..6209164 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc
@@ -6,7 +6,6 @@
 
 #include <string>
 
-#include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ -14,7 +13,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
-#include "content/public/test/test_browser_thread.h"
+#include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/tree/tree_view.h"
@@ -25,17 +24,12 @@ using base::Time;
 using base::TimeDelta;
 using bookmarks::BookmarkModel;
 using bookmarks::BookmarkNode;
-using content::BrowserThread;
 
 // Base class for bookmark editor tests. Creates a BookmarkModel and populates
 // it with test data.
 class BookmarkEditorViewTest : public testing::Test {
  public:
-  BookmarkEditorViewTest()
-      : ui_thread_(BrowserThread::UI, &message_loop_),
-        file_thread_(BrowserThread::FILE, &message_loop_),
-        model_(NULL) {
-  }
+  BookmarkEditorViewTest() : model_(nullptr) {}
 
   void SetUp() override {
     profile_.reset(new TestingProfile());
@@ -47,10 +41,6 @@ class BookmarkEditorViewTest : public testing::Test {
     AddTestData();
   }
 
-  void TearDown() override {
-    message_loop_.RunUntilIdle();
-  }
-
  protected:
   std::string base_path() const { return "file:///c:/tmp/"; }
 
@@ -112,9 +102,7 @@ class BookmarkEditorViewTest : public testing::Test {
 
   views::TreeView* tree_view() { return editor_->tree_view_; }
 
-  base::MessageLoopForUI message_loop_;
-  content::TestBrowserThread ui_thread_;
-  content::TestBrowserThread file_thread_;
+  content::TestBrowserThreadBundle thread_bundle_;
 
   BookmarkModel* model_;
   scoped_ptr<TestingProfile> profile_;