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

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

Issue 623133002: replace OVERRIDE and FINAL with override and final in components/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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 "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/strings/string16.h" 8 #include "base/strings/string16.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "components/bookmarks/browser/bookmark_model.h" 10 #include "components/bookmarks/browser/bookmark_model.h"
11 #include "components/bookmarks/browser/bookmark_node_data.h" 11 #include "components/bookmarks/browser/bookmark_node_data.h"
12 #include "components/bookmarks/test/bookmark_test_helpers.h" 12 #include "components/bookmarks/test/bookmark_test_helpers.h"
13 #include "components/bookmarks/test/test_bookmark_client.h" 13 #include "components/bookmarks/test/test_bookmark_client.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "ui/base/dragdrop/os_exchange_data.h" 15 #include "ui/base/dragdrop/os_exchange_data.h"
16 #include "ui/events/platform/platform_event_source.h" 16 #include "ui/events/platform/platform_event_source.h"
17 #include "url/gurl.h" 17 #include "url/gurl.h"
18 18
19 using base::ASCIIToUTF16; 19 using base::ASCIIToUTF16;
20 20
21 namespace bookmarks { 21 namespace bookmarks {
22 22
23 class BookmarkNodeDataTest : public testing::Test { 23 class BookmarkNodeDataTest : public testing::Test {
24 public: 24 public:
25 BookmarkNodeDataTest() {} 25 BookmarkNodeDataTest() {}
26 26
27 virtual void SetUp() OVERRIDE { 27 virtual void SetUp() override {
28 event_source_ = ui::PlatformEventSource::CreateDefault(); 28 event_source_ = ui::PlatformEventSource::CreateDefault();
29 model_ = client_.CreateModel(); 29 model_ = client_.CreateModel();
30 test::WaitForBookmarkModelToLoad(model_.get()); 30 test::WaitForBookmarkModelToLoad(model_.get());
31 bool success = profile_dir_.CreateUniqueTempDir(); 31 bool success = profile_dir_.CreateUniqueTempDir();
32 ASSERT_TRUE(success); 32 ASSERT_TRUE(success);
33 } 33 }
34 34
35 virtual void TearDown() OVERRIDE { 35 virtual void TearDown() override {
36 model_.reset(); 36 model_.reset();
37 event_source_.reset(); 37 event_source_.reset();
38 bool success = profile_dir_.Delete(); 38 bool success = profile_dir_.Delete();
39 ASSERT_TRUE(success); 39 ASSERT_TRUE(success);
40 } 40 }
41 41
42 const base::FilePath& GetProfilePath() const { return profile_dir_.path(); } 42 const base::FilePath& GetProfilePath() const { return profile_dir_.path(); }
43 43
44 BookmarkModel* model() { return model_.get(); } 44 BookmarkModel* model() { return model_.get(); }
45 45
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 ASSERT_EQ(1u, read_data.elements.size()); 291 ASSERT_EQ(1u, read_data.elements.size());
292 292
293 // Verify that the read data contains the same meta info. 293 // Verify that the read data contains the same meta info.
294 BookmarkNode::MetaInfoMap meta_info_map = read_data.elements[0].meta_info_map; 294 BookmarkNode::MetaInfoMap meta_info_map = read_data.elements[0].meta_info_map;
295 EXPECT_EQ(2u, meta_info_map.size()); 295 EXPECT_EQ(2u, meta_info_map.size());
296 EXPECT_EQ("somevalue", meta_info_map["somekey"]); 296 EXPECT_EQ("somevalue", meta_info_map["somekey"]);
297 EXPECT_EQ("someothervalue", meta_info_map["someotherkey"]); 297 EXPECT_EQ("someothervalue", meta_info_map["someotherkey"]);
298 } 298 }
299 299
300 } // namespace bookmarks 300 } // namespace bookmarks
OLDNEW
« no previous file with comments | « components/bookmarks/browser/bookmark_node.h ('k') | components/bookmarks/browser/bookmark_storage.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698