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

Side by Side Diff: components/bookmarks/browser/bookmark_node_data_unittest.cc

Issue 1198963014: Change ownership of BookmarkClient (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@cleanup_managed_and_supervised_nodes
Patch Set: Rebase 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 "base/basictypes.h" 5 #include "base/basictypes.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 10 matching lines...) Expand all
21 using base::ASCIIToUTF16; 21 using base::ASCIIToUTF16;
22 22
23 namespace bookmarks { 23 namespace bookmarks {
24 24
25 class BookmarkNodeDataTest : public testing::Test { 25 class BookmarkNodeDataTest : public testing::Test {
26 public: 26 public:
27 BookmarkNodeDataTest() {} 27 BookmarkNodeDataTest() {}
28 28
29 void SetUp() override { 29 void SetUp() override {
30 event_source_ = ui::PlatformEventSource::CreateDefault(); 30 event_source_ = ui::PlatformEventSource::CreateDefault();
31 model_ = client_.CreateModel(); 31 model_ = TestBookmarkClient::CreateModel();
32 test::WaitForBookmarkModelToLoad(model_.get()); 32 test::WaitForBookmarkModelToLoad(model_.get());
33 bool success = profile_dir_.CreateUniqueTempDir(); 33 bool success = profile_dir_.CreateUniqueTempDir();
34 ASSERT_TRUE(success); 34 ASSERT_TRUE(success);
35 } 35 }
36 36
37 void TearDown() override { 37 void TearDown() override {
38 model_.reset(); 38 model_.reset();
39 event_source_.reset(); 39 event_source_.reset();
40 bool success = profile_dir_.Delete(); 40 bool success = profile_dir_.Delete();
41 ASSERT_TRUE(success); 41 ASSERT_TRUE(success);
42 ui::Clipboard::DestroyClipboardForCurrentThread(); 42 ui::Clipboard::DestroyClipboardForCurrentThread();
43 } 43 }
44 44
45 const base::FilePath& GetProfilePath() const { return profile_dir_.path(); } 45 const base::FilePath& GetProfilePath() const { return profile_dir_.path(); }
46 46
47 BookmarkModel* model() { return model_.get(); } 47 BookmarkModel* model() { return model_.get(); }
48 48
49 protected: 49 protected:
50 ui::Clipboard& clipboard() { return *ui::Clipboard::GetForCurrentThread(); } 50 ui::Clipboard& clipboard() { return *ui::Clipboard::GetForCurrentThread(); }
51 51
52 private: 52 private:
53 base::ScopedTempDir profile_dir_; 53 base::ScopedTempDir profile_dir_;
54 TestBookmarkClient client_;
55 scoped_ptr<BookmarkModel> model_; 54 scoped_ptr<BookmarkModel> model_;
56 scoped_ptr<ui::PlatformEventSource> event_source_; 55 scoped_ptr<ui::PlatformEventSource> event_source_;
57 base::MessageLoopForUI loop_; 56 base::MessageLoopForUI loop_;
58 57
59 DISALLOW_COPY_AND_ASSIGN(BookmarkNodeDataTest); 58 DISALLOW_COPY_AND_ASSIGN(BookmarkNodeDataTest);
60 }; 59 };
61 60
62 namespace { 61 namespace {
63 62
64 ui::OSExchangeData::Provider* CloneProvider(const ui::OSExchangeData& data) { 63 ui::OSExchangeData::Provider* CloneProvider(const ui::OSExchangeData& data) {
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 ASSERT_EQ(1u, read_data.size()); 396 ASSERT_EQ(1u, read_data.size());
398 397
399 // Verify that the read data contains the same meta info. 398 // Verify that the read data contains the same meta info.
400 BookmarkNode::MetaInfoMap meta_info_map = read_data.elements[0].meta_info_map; 399 BookmarkNode::MetaInfoMap meta_info_map = read_data.elements[0].meta_info_map;
401 EXPECT_EQ(2u, meta_info_map.size()); 400 EXPECT_EQ(2u, meta_info_map.size());
402 EXPECT_EQ("somevalue", meta_info_map["somekey"]); 401 EXPECT_EQ("somevalue", meta_info_map["somekey"]);
403 EXPECT_EQ("someothervalue", meta_info_map["someotherkey"]); 402 EXPECT_EQ("someothervalue", meta_info_map["someotherkey"]);
404 } 403 }
405 404
406 } // namespace bookmarks 405 } // namespace bookmarks
OLDNEW
« no previous file with comments | « components/bookmarks/browser/bookmark_model_unittest.cc ('k') | components/bookmarks/browser/bookmark_utils_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698