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

Side by Side Diff: chrome/browser/ui/cocoa/one_click_signin_bubble_controller_unittest.mm

Issue 627043002: replace OVERRIDE and FINAL with override and final in chrome/browser/ui/[a-s]* (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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h" 5 #import "chrome/browser/ui/cocoa/one_click_signin_bubble_controller.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 12 matching lines...) Expand all
23 using ::testing::_; 23 using ::testing::_;
24 24
25 class OneClickSigninBubbleControllerTest : public CocoaProfileTest { 25 class OneClickSigninBubbleControllerTest : public CocoaProfileTest {
26 public: 26 public:
27 OneClickSigninBubbleControllerTest() 27 OneClickSigninBubbleControllerTest()
28 : weak_ptr_factory_(this), 28 : weak_ptr_factory_(this),
29 start_sync_callback_( 29 start_sync_callback_(
30 base::Bind(&OneClickSigninBubbleControllerTest::OnStartSync, 30 base::Bind(&OneClickSigninBubbleControllerTest::OnStartSync,
31 weak_ptr_factory_.GetWeakPtr())) {} 31 weak_ptr_factory_.GetWeakPtr())) {}
32 32
33 virtual void SetUp() OVERRIDE { 33 virtual void SetUp() override {
34 CocoaProfileTest::SetUp(); 34 CocoaProfileTest::SetUp();
35 BrowserWindowCocoa* browser_window = 35 BrowserWindowCocoa* browser_window =
36 static_cast<BrowserWindowCocoa*>(browser()->window()); 36 static_cast<BrowserWindowCocoa*>(browser()->window());
37 controller_.reset([[OneClickSigninBubbleController alloc] 37 controller_.reset([[OneClickSigninBubbleController alloc]
38 initWithBrowserWindowController:browser_window->cocoa_controller() 38 initWithBrowserWindowController:browser_window->cocoa_controller()
39 webContents:nil 39 webContents:nil
40 errorMessage:nil 40 errorMessage:nil
41 callback:start_sync_callback_]); 41 callback:start_sync_callback_]);
42 [controller_ showWindow:nil]; 42 [controller_ showWindow:nil];
43 EXPECT_NSEQ(@"OneClickSigninBubble", 43 EXPECT_NSEQ(@"OneClickSigninBubble",
44 [[controller_ viewController] nibName]); 44 [[controller_ viewController] nibName]);
45 } 45 }
46 46
47 virtual void TearDown() OVERRIDE { 47 virtual void TearDown() override {
48 controller_.reset(); 48 controller_.reset();
49 CocoaProfileTest::TearDown(); 49 CocoaProfileTest::TearDown();
50 } 50 }
51 51
52 MOCK_METHOD1(OnStartSync, void(OneClickSigninSyncStarter::StartSyncMode)); 52 MOCK_METHOD1(OnStartSync, void(OneClickSigninSyncStarter::StartSyncMode));
53 53
54 protected: 54 protected:
55 base::WeakPtrFactory<OneClickSigninBubbleControllerTest> weak_ptr_factory_; 55 base::WeakPtrFactory<OneClickSigninBubbleControllerTest> weak_ptr_factory_;
56 BrowserWindow::StartSyncCallback start_sync_callback_; 56 BrowserWindow::StartSyncCallback start_sync_callback_;
57 base::scoped_nsobject<OneClickSigninBubbleController> controller_; 57 base::scoped_nsobject<OneClickSigninBubbleController> controller_;
(...skipping 18 matching lines...) Expand all
76 } 76 }
77 77
78 // Test that the bubble does not sync if the bubble is closed. 78 // Test that the bubble does not sync if the bubble is closed.
79 TEST_F(OneClickSigninBubbleControllerTest, Close) { 79 TEST_F(OneClickSigninBubbleControllerTest, Close) {
80 EXPECT_CALL(*this, OnStartSync( 80 EXPECT_CALL(*this, OnStartSync(
81 OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS)).Times(0); 81 OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS)).Times(0);
82 [controller_ close]; 82 [controller_ close];
83 } 83 }
84 84
85 } // namespace 85 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698