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

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

Issue 1144153004: components: Remove use of MessageLoopProxy and deprecated MessageLoop APIs (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased. Created 5 years, 6 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 "base/bind.h" 7 #include "base/bind.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop/message_loop.h" 10 #include "base/message_loop/message_loop.h"
11 #include "base/prefs/pref_registry_simple.h" 11 #include "base/prefs/pref_registry_simple.h"
12 #include "base/prefs/testing_pref_service.h" 12 #include "base/prefs/testing_pref_service.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "base/thread_task_runner_handle.h"
14 #include "components/bookmarks/browser/bookmark_model.h" 15 #include "components/bookmarks/browser/bookmark_model.h"
15 #include "components/bookmarks/browser/bookmark_model_observer.h" 16 #include "components/bookmarks/browser/bookmark_model_observer.h"
16 #include "components/bookmarks/browser/bookmark_node.h" 17 #include "components/bookmarks/browser/bookmark_node.h"
17 #include "components/bookmarks/common/bookmark_pref_names.h" 18 #include "components/bookmarks/common/bookmark_pref_names.h"
18 #include "components/bookmarks/test/bookmark_test_helpers.h" 19 #include "components/bookmarks/test/bookmark_test_helpers.h"
19 #include "components/bookmarks/test/mock_bookmark_model_observer.h" 20 #include "components/bookmarks/test/mock_bookmark_model_observer.h"
20 #include "components/bookmarks/test/test_bookmark_client.h" 21 #include "components/bookmarks/test/test_bookmark_client.h"
21 #include "grit/components_strings.h" 22 #include "grit/components_strings.h"
22 #include "testing/gmock/include/gmock/gmock.h" 23 #include "testing/gmock/include/gmock/gmock.h"
23 #include "testing/gtest/include/gtest/gtest.h" 24 #include "testing/gtest/include/gtest/gtest.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 is_supervised ? IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME 59 is_supervised ? IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME
59 : IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME)); 60 : IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
60 61
61 bookmarks::BookmarkPermanentNodeList extra_nodes; 62 bookmarks::BookmarkPermanentNodeList extra_nodes;
62 extra_nodes.push_back(managed_node); 63 extra_nodes.push_back(managed_node);
63 client_.SetExtraNodesToLoad(extra_nodes.Pass()); 64 client_.SetExtraNodesToLoad(extra_nodes.Pass());
64 65
65 model_.reset(new BookmarkModel(&client_)); 66 model_.reset(new BookmarkModel(&client_));
66 model_->AddObserver(&observer_); 67 model_->AddObserver(&observer_);
67 EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _)); 68 EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _));
68 model_->Load(&prefs_, 69 model_->Load(&prefs_, std::string(), base::FilePath(),
69 std::string(), 70 base::ThreadTaskRunnerHandle::Get(),
70 base::FilePath(), 71 base::ThreadTaskRunnerHandle::Get());
71 base::MessageLoopProxy::current(),
72 base::MessageLoopProxy::current());
73 bookmarks::test::WaitForBookmarkModelToLoad(model_.get()); 72 bookmarks::test::WaitForBookmarkModelToLoad(model_.get());
74 Mock::VerifyAndClearExpectations(&observer_); 73 Mock::VerifyAndClearExpectations(&observer_);
75 74
76 ASSERT_EQ(1u, client_.extra_nodes().size()); 75 ASSERT_EQ(1u, client_.extra_nodes().size());
77 managed_node_ = client_.extra_nodes()[0]; 76 managed_node_ = client_.extra_nodes()[0];
78 ASSERT_EQ(managed_node, managed_node_); 77 ASSERT_EQ(managed_node, managed_node_);
79 78
80 managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker( 79 managed_bookmarks_tracker_.reset(new ManagedBookmarksTracker(
81 model_.get(), 80 model_.get(),
82 &prefs_, 81 &prefs_,
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 Mock::VerifyAndClearExpectations(&observer_); 334 Mock::VerifyAndClearExpectations(&observer_);
336 335
337 EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _)); 336 EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _));
338 model_->RemoveAllUserBookmarks(); 337 model_->RemoveAllUserBookmarks();
339 EXPECT_EQ(2, managed_node()->child_count()); 338 EXPECT_EQ(2, managed_node()->child_count());
340 EXPECT_EQ(0, model_->bookmark_bar_node()->child_count()); 339 EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
341 Mock::VerifyAndClearExpectations(&observer_); 340 Mock::VerifyAndClearExpectations(&observer_);
342 } 341 }
343 342
344 } // namespace bookmarks 343 } // namespace bookmarks
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698