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

Side by Side Diff: chrome/browser/android/bookmarks/partner_bookmarks_shim_unittest.cc

Issue 884213005: Update {virtual,override,final} to follow C++11 style. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 5 years, 10 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 "chrome/browser/android/bookmarks/partner_bookmarks_shim.h" 5 #include "chrome/browser/android/bookmarks/partner_bookmarks_shim.h"
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.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 "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 53
54 const BookmarkNode* AddFolder(const BookmarkNode* parent, 54 const BookmarkNode* AddFolder(const BookmarkNode* parent,
55 const base::string16& title) { 55 const base::string16& title) {
56 if (!parent) 56 if (!parent)
57 parent = model_->bookmark_bar_node(); 57 parent = model_->bookmark_bar_node();
58 return model_->AddFolder(parent, parent->child_count(), title); 58 return model_->AddFolder(parent, parent->child_count(), title);
59 } 59 }
60 60
61 protected: 61 protected:
62 // testing::Test 62 // testing::Test
63 virtual void SetUp() override { 63 void SetUp() override {
64 profile_.reset(new TestingProfile()); 64 profile_.reset(new TestingProfile());
65 profile_->CreateBookmarkModel(true); 65 profile_->CreateBookmarkModel(true);
66 66
67 model_ = BookmarkModelFactory::GetForProfile(profile_.get()); 67 model_ = BookmarkModelFactory::GetForProfile(profile_.get());
68 bookmarks::test::WaitForBookmarkModelToLoad(model_); 68 bookmarks::test::WaitForBookmarkModelToLoad(model_);
69 } 69 }
70 70
71 virtual void TearDown() override { 71 void TearDown() override {
72 PartnerBookmarksShim::ClearInBrowserContextForTesting(profile_.get()); 72 PartnerBookmarksShim::ClearInBrowserContextForTesting(profile_.get());
73 PartnerBookmarksShim::ClearPartnerModelForTesting(); 73 PartnerBookmarksShim::ClearPartnerModelForTesting();
74 PartnerBookmarksShim::EnablePartnerBookmarksEditing(); 74 PartnerBookmarksShim::EnablePartnerBookmarksEditing();
75 profile_.reset(NULL); 75 profile_.reset(NULL);
76 } 76 }
77 77
78 scoped_ptr<TestingProfile> profile_; 78 scoped_ptr<TestingProfile> profile_;
79 79
80 base::MessageLoopForUI message_loop_; 80 base::MessageLoopForUI message_loop_;
81 content::TestBrowserThread ui_thread_; 81 content::TestBrowserThread ui_thread_;
(...skipping 322 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 shim->RenameBookmark(partner_bookmark1, base::ASCIIToUTF16("a2.com")); 404 shim->RenameBookmark(partner_bookmark1, base::ASCIIToUTF16("a2.com"));
405 shim->RemoveBookmark(partner_bookmark2); 405 shim->RemoveBookmark(partner_bookmark2);
406 EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1)); 406 EXPECT_EQ(base::ASCIIToUTF16("a2.com"), shim->GetTitle(partner_bookmark1));
407 EXPECT_FALSE(shim->IsReachable(partner_bookmark2)); 407 EXPECT_FALSE(shim->IsReachable(partner_bookmark2));
408 408
409 // Disable edits and check that edits are not applied anymore. 409 // Disable edits and check that edits are not applied anymore.
410 PartnerBookmarksShim::DisablePartnerBookmarksEditing(); 410 PartnerBookmarksShim::DisablePartnerBookmarksEditing();
411 EXPECT_EQ(base::ASCIIToUTF16("a"), shim->GetTitle(partner_bookmark1)); 411 EXPECT_EQ(base::ASCIIToUTF16("a"), shim->GetTitle(partner_bookmark1));
412 EXPECT_TRUE(shim->IsReachable(partner_bookmark2)); 412 EXPECT_TRUE(shim->IsReachable(partner_bookmark2));
413 } 413 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698