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

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

Issue 2379863002: Fix object ownership in ui/base/models. (Closed)
Patch Set: fix Created 4 years, 2 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/memory/ptr_util.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
13 #include "base/run_loop.h" 14 #include "base/run_loop.h"
14 #include "base/strings/utf_string_conversions.h" 15 #include "base/strings/utf_string_conversions.h"
15 #include "base/threading/thread_task_runner_handle.h" 16 #include "base/threading/thread_task_runner_handle.h"
16 #include "components/bookmarks/browser/bookmark_model.h" 17 #include "components/bookmarks/browser/bookmark_model.h"
17 #include "components/bookmarks/browser/bookmark_model_observer.h" 18 #include "components/bookmarks/browser/bookmark_model_observer.h"
18 #include "components/bookmarks/browser/bookmark_node.h" 19 #include "components/bookmarks/browser/bookmark_node.h"
19 #include "components/bookmarks/browser/bookmark_utils.h" 20 #include "components/bookmarks/browser/bookmark_utils.h"
20 #include "components/bookmarks/common/bookmark_pref_names.h" 21 #include "components/bookmarks/common/bookmark_pref_names.h"
21 #include "components/bookmarks/test/bookmark_test_helpers.h" 22 #include "components/bookmarks/test/bookmark_test_helpers.h"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 ManagedBookmarksTracker::LoadInitial( 56 ManagedBookmarksTracker::LoadInitial(
56 managed_node, 57 managed_node,
57 prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)), 58 prefs_.GetList(ManagedBookmarksTracker::GetPrefName(is_supervised)),
58 101); 59 101);
59 managed_node->set_visible(!managed_node->empty()); 60 managed_node->set_visible(!managed_node->empty());
60 managed_node->SetTitle(l10n_util::GetStringUTF16( 61 managed_node->SetTitle(l10n_util::GetStringUTF16(
61 is_supervised ? IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME 62 is_supervised ? IDS_BOOKMARK_BAR_SUPERVISED_FOLDER_DEFAULT_NAME
62 : IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME)); 63 : IDS_BOOKMARK_BAR_MANAGED_FOLDER_DEFAULT_NAME));
63 64
64 BookmarkPermanentNodeList extra_nodes; 65 BookmarkPermanentNodeList extra_nodes;
65 extra_nodes.push_back(managed_node); 66 extra_nodes.push_back(base::WrapUnique(managed_node));
66 67
67 std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient); 68 std::unique_ptr<TestBookmarkClient> client(new TestBookmarkClient);
68 client->SetExtraNodesToLoad(std::move(extra_nodes)); 69 client->SetExtraNodesToLoad(std::move(extra_nodes));
69 model_.reset(new BookmarkModel(std::move(client))); 70 model_.reset(new BookmarkModel(std::move(client)));
70 71
71 model_->AddObserver(&observer_); 72 model_->AddObserver(&observer_);
72 EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _)); 73 EXPECT_CALL(observer_, BookmarkModelLoaded(model_.get(), _));
73 model_->Load(&prefs_, base::FilePath(), 74 model_->Load(&prefs_, base::FilePath(),
74 base::ThreadTaskRunnerHandle::Get(), 75 base::ThreadTaskRunnerHandle::Get(),
75 base::ThreadTaskRunnerHandle::Get()); 76 base::ThreadTaskRunnerHandle::Get());
(...skipping 278 matching lines...) Expand 10 before | Expand all | Expand 10 after
354 Mock::VerifyAndClearExpectations(&observer_); 355 Mock::VerifyAndClearExpectations(&observer_);
355 356
356 EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _)); 357 EXPECT_CALL(observer_, BookmarkAllUserNodesRemoved(model_.get(), _));
357 model_->RemoveAllUserBookmarks(); 358 model_->RemoveAllUserBookmarks();
358 EXPECT_EQ(2, managed_node()->child_count()); 359 EXPECT_EQ(2, managed_node()->child_count());
359 EXPECT_EQ(0, model_->bookmark_bar_node()->child_count()); 360 EXPECT_EQ(0, model_->bookmark_bar_node()->child_count());
360 Mock::VerifyAndClearExpectations(&observer_); 361 Mock::VerifyAndClearExpectations(&observer_);
361 } 362 }
362 363
363 } // namespace bookmarks 364 } // namespace bookmarks
OLDNEW
« no previous file with comments | « components/bookmarks/managed/managed_bookmarks_tracker.cc ('k') | components/bookmarks/test/test_bookmark_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698