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

Side by Side Diff: chrome/browser/ui/views/bookmarks/bookmark_bubble_view_unittest.cc

Issue 628773002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[t-v]* (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 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/ui/views/bookmarks/bookmark_bubble_view.h" 5 #include "chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "chrome/browser/bookmarks/bookmark_model_factory.h" 10 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
11 #include "chrome/browser/signin/fake_signin_manager.h" 11 #include "chrome/browser/signin/fake_signin_manager.h"
12 #include "chrome/browser/signin/signin_manager_factory.h" 12 #include "chrome/browser/signin/signin_manager_factory.h"
13 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h" 13 #include "chrome/browser/ui/bookmarks/bookmark_bubble_delegate.h"
14 #include "chrome/test/base/browser_with_test_window_test.h" 14 #include "chrome/test/base/browser_with_test_window_test.h"
15 #include "components/bookmarks/browser/bookmark_utils.h" 15 #include "components/bookmarks/browser/bookmark_utils.h"
16 #include "components/bookmarks/test/bookmark_test_helpers.h" 16 #include "components/bookmarks/test/bookmark_test_helpers.h"
17 #include "components/signin/core/browser/signin_manager.h" 17 #include "components/signin/core/browser/signin_manager.h"
18 18
19 namespace { 19 namespace {
20 const char kTestBookmarkURL[] = "http://www.google.com"; 20 const char kTestBookmarkURL[] = "http://www.google.com";
21 } // namespace 21 } // namespace
22 22
23 class BookmarkBubbleViewTest : public BrowserWithTestWindowTest { 23 class BookmarkBubbleViewTest : public BrowserWithTestWindowTest {
24 public: 24 public:
25 BookmarkBubbleViewTest() {} 25 BookmarkBubbleViewTest() {}
26 26
27 // testing::Test: 27 // testing::Test:
28 virtual void SetUp() OVERRIDE { 28 virtual void SetUp() override {
29 BrowserWithTestWindowTest::SetUp(); 29 BrowserWithTestWindowTest::SetUp();
30 30
31 profile()->CreateBookmarkModel(true); 31 profile()->CreateBookmarkModel(true);
32 BookmarkModel* bookmark_model = 32 BookmarkModel* bookmark_model =
33 BookmarkModelFactory::GetForProfile(profile()); 33 BookmarkModelFactory::GetForProfile(profile());
34 test::WaitForBookmarkModelToLoad(bookmark_model); 34 test::WaitForBookmarkModelToLoad(bookmark_model);
35 35
36 bookmarks::AddIfNotBookmarked( 36 bookmarks::AddIfNotBookmarked(
37 bookmark_model, GURL(kTestBookmarkURL), base::string16()); 37 bookmark_model, GURL(kTestBookmarkURL), base::string16());
38 } 38 }
39 39
40 virtual void TearDown() OVERRIDE { 40 virtual void TearDown() override {
41 // Make sure the bubble is destroyed before the profile to avoid a crash. 41 // Make sure the bubble is destroyed before the profile to avoid a crash.
42 bubble_.reset(); 42 bubble_.reset();
43 43
44 BrowserWithTestWindowTest::TearDown(); 44 BrowserWithTestWindowTest::TearDown();
45 } 45 }
46 46
47 // BrowserWithTestWindowTest: 47 // BrowserWithTestWindowTest:
48 virtual TestingProfile* CreateProfile() OVERRIDE { 48 virtual TestingProfile* CreateProfile() override {
49 TestingProfile::Builder builder; 49 TestingProfile::Builder builder;
50 builder.AddTestingFactory(SigninManagerFactory::GetInstance(), 50 builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
51 FakeSigninManagerBase::Build); 51 FakeSigninManagerBase::Build);
52 return builder.Build().release(); 52 return builder.Build().release();
53 } 53 }
54 54
55 protected: 55 protected:
56 // Creates a bookmark bubble view. 56 // Creates a bookmark bubble view.
57 void CreateBubbleView() { 57 void CreateBubbleView() {
58 scoped_ptr<BookmarkBubbleDelegate> delegate; 58 scoped_ptr<BookmarkBubbleDelegate> delegate;
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 // Verifies that the sync promo is displayed for a user that is not signed in. 90 // Verifies that the sync promo is displayed for a user that is not signed in.
91 TEST_F(BookmarkBubbleViewTest, SyncPromoNotSignedIn) { 91 TEST_F(BookmarkBubbleViewTest, SyncPromoNotSignedIn) {
92 CreateBubbleView(); 92 CreateBubbleView();
93 bubble_->Init(); 93 bubble_->Init();
94 #if defined(OS_CHROMEOS) 94 #if defined(OS_CHROMEOS)
95 EXPECT_FALSE(bubble_->sync_promo_view_); 95 EXPECT_FALSE(bubble_->sync_promo_view_);
96 #else // !defined(OS_CHROMEOS) 96 #else // !defined(OS_CHROMEOS)
97 EXPECT_TRUE(bubble_->sync_promo_view_); 97 EXPECT_TRUE(bubble_->sync_promo_view_);
98 #endif 98 #endif
99 } 99 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc ('k') | chrome/browser/ui/views/bookmarks/bookmark_context_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698