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

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

Issue 1100223002: Update {virtual,override} to follow C++11 style in chrome. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 8 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 13 matching lines...) Expand all
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 33
34 virtual void SetUp() override { 34 void SetUp() override {
35 CocoaProfileTest::SetUp(); 35 CocoaProfileTest::SetUp();
36 BrowserWindowCocoa* browser_window = 36 BrowserWindowCocoa* browser_window =
37 static_cast<BrowserWindowCocoa*>(browser()->window()); 37 static_cast<BrowserWindowCocoa*>(browser()->window());
38 controller_.reset([[OneClickSigninBubbleController alloc] 38 controller_.reset([[OneClickSigninBubbleController alloc]
39 initWithBrowserWindowController:browser_window->cocoa_controller() 39 initWithBrowserWindowController:browser_window->cocoa_controller()
40 webContents:nil 40 webContents:nil
41 errorMessage:nil 41 errorMessage:nil
42 callback:start_sync_callback_]); 42 callback:start_sync_callback_]);
43 [controller_ showWindow:nil]; 43 [controller_ showWindow:nil];
44 EXPECT_NSEQ(@"OneClickSigninBubble", 44 EXPECT_NSEQ(@"OneClickSigninBubble",
45 [[controller_ viewController] nibName]); 45 [[controller_ viewController] nibName]);
46 } 46 }
47 47
48 virtual void TearDown() override { 48 void TearDown() override {
49 controller_.reset(); 49 controller_.reset();
50 CocoaProfileTest::TearDown(); 50 CocoaProfileTest::TearDown();
51 } 51 }
52 52
53 MOCK_METHOD1(OnStartSync, void(OneClickSigninSyncStarter::StartSyncMode)); 53 MOCK_METHOD1(OnStartSync, void(OneClickSigninSyncStarter::StartSyncMode));
54 54
55 protected: 55 protected:
56 BrowserWindow::StartSyncCallback start_sync_callback_; 56 BrowserWindow::StartSyncCallback start_sync_callback_;
57 base::scoped_nsobject<OneClickSigninBubbleController> controller_; 57 base::scoped_nsobject<OneClickSigninBubbleController> controller_;
58 58
(...skipping 19 matching lines...) Expand all
78 } 78 }
79 79
80 // Test that the bubble does not sync if the bubble is closed. 80 // Test that the bubble does not sync if the bubble is closed.
81 TEST_F(OneClickSigninBubbleControllerTest, Close) { 81 TEST_F(OneClickSigninBubbleControllerTest, Close) {
82 EXPECT_CALL(*this, OnStartSync( 82 EXPECT_CALL(*this, OnStartSync(
83 OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS)).Times(0); 83 OneClickSigninSyncStarter::SYNC_WITH_DEFAULT_SETTINGS)).Times(0);
84 [controller_ close]; 84 [controller_ close];
85 } 85 }
86 86
87 } // namespace 87 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698