Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Side by Side Diff: components/bookmarks/managed/managed_bookmarks_tracker_unittest.cc

Issue 2082333002: Remove calls to deprecated MessageLoop methods in components. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "components/bookmarks/managed/managed_bookmarks_tracker.h" 5 #include "components/bookmarks/managed/managed_bookmarks_tracker.h"
6 6
7 #include <memory> 7 #include <memory>
8 #include <utility> 8 #include <utility>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/message_loop/message_loop.h" 12 #include "base/message_loop/message_loop.h"
13 #include "base/run_loop.h"
13 #include "base/strings/utf_string_conversions.h" 14 #include "base/strings/utf_string_conversions.h"
14 #include "base/threading/thread_task_runner_handle.h" 15 #include "base/threading/thread_task_runner_handle.h"
15 #include "components/bookmarks/browser/bookmark_model.h" 16 #include "components/bookmarks/browser/bookmark_model.h"
16 #include "components/bookmarks/browser/bookmark_model_observer.h" 17 #include "components/bookmarks/browser/bookmark_model_observer.h"
17 #include "components/bookmarks/browser/bookmark_node.h" 18 #include "components/bookmarks/browser/bookmark_node.h"
18 #include "components/bookmarks/browser/bookmark_utils.h" 19 #include "components/bookmarks/browser/bookmark_utils.h"
19 #include "components/bookmarks/common/bookmark_pref_names.h" 20 #include "components/bookmarks/common/bookmark_pref_names.h"
20 #include "components/bookmarks/test/bookmark_test_helpers.h" 21 #include "components/bookmarks/test/bookmark_test_helpers.h"
21 #include "components/bookmarks/test/mock_bookmark_model_observer.h" 22 #include "components/bookmarks/test/mock_bookmark_model_observer.h"
22 #include "components/bookmarks/test/test_bookmark_client.h" 23 #include "components/bookmarks/test/test_bookmark_client.h"
(...skipping 15 matching lines...) Expand all
38 ManagedBookmarksTrackerTest() : managed_node_(NULL) {} 39 ManagedBookmarksTrackerTest() : managed_node_(NULL) {}
39 ~ManagedBookmarksTrackerTest() override {} 40 ~ManagedBookmarksTrackerTest() override {}
40 41
41 void SetUp() override { 42 void SetUp() override {
42 RegisterManagedBookmarksPrefs(prefs_.registry()); 43 RegisterManagedBookmarksPrefs(prefs_.registry());
43 } 44 }
44 45
45 void TearDown() override { 46 void TearDown() override {
46 if (model_) 47 if (model_)
47 model_->RemoveObserver(&observer_); 48 model_->RemoveObserver(&observer_);
48 loop_.RunUntilIdle(); 49 base::RunLoop().RunUntilIdle();
49 } 50 }
50 51
51 void CreateModel(bool is_supervised) { 52 void CreateModel(bool is_supervised) {
52 // Simulate the creation of the managed node by the BookmarkClient. 53 // Simulate the creation of the managed node by the BookmarkClient.
53 BookmarkPermanentNode* managed_node = new BookmarkPermanentNode(100); 54 BookmarkPermanentNode* managed_node = new BookmarkPermanentNode(100);
54 ManagedBookmarksTracker::LoadInitial( 55 ManagedBookmarksTracker::LoadInitial(
55 managed_node, 56 managed_node,
56 prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)), 57 prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)),
57 101); 58 101);
58 managed_node->set_visible(!managed_node->empty()); 59 managed_node->set_visible(!managed_node->empty());
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 Mock::VerifyAndClearExpectations(&observer_); 352 Mock::VerifyAndClearExpectations(&observer_);
352 353
353 EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _)); 354 EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _));
354 model_->RemoveAllUserBookmarks(); 355 model_->RemoveAllUserBookmarks();
355 EXPECT_EQ(2, managed_node()->child_count()); 356 EXPECT_EQ(2, managed_node()->child_count());
356 EXPECT_EQ(0, model_->bookmark_bar_node()->child_count()); 357 EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
357 Mock::VerifyAndClearExpectations(&observer_); 358 Mock::VerifyAndClearExpectations(&observer_);
358 } 359 }
359 360
360 } // namespace bookmarks 361 } // namespace bookmarks
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698