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

Side by Side Diff: chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view_unittest.mm

Issue 1302233003: Replace gmock's deprecated SetArgumentPointee with SetArgPointee. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 2017 Created 3 years, 7 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 <Cocoa/Cocoa.h> 5 #import <Cocoa/Cocoa.h>
6 6
7 #include "base/mac/scoped_nsobject.h" 7 #include "base/mac/scoped_nsobject.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/themes/theme_properties.h" 9 #include "chrome/browser/themes/theme_properties.h"
10 #include "chrome/browser/themes/theme_service.h" 10 #include "chrome/browser/themes/theme_service.h"
11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h" 11 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_controller.h"
12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h" 12 #import "chrome/browser/ui/cocoa/bookmarks/bookmark_bar_toolbar_view.h"
13 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h" 13 #import "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
14 #include "testing/gmock/include/gmock/gmock.h" 14 #include "testing/gmock/include/gmock/gmock.h"
15 #include "testing/gtest/include/gtest/gtest.h" 15 #include "testing/gtest/include/gtest/gtest.h"
16 #include "testing/platform_test.h" 16 #include "testing/platform_test.h"
17 #include "third_party/skia/include/core/SkBitmap.h" 17 #include "third_party/skia/include/core/SkBitmap.h"
18 #include "third_party/skia/include/core/SkColor.h" 18 #include "third_party/skia/include/core/SkColor.h"
19 #include "ui/gfx/image/image_skia.h" 19 #include "ui/gfx/image/image_skia.h"
20 20
21 using ::testing::_; 21 using ::testing::_;
22 using ::testing::DoAll; 22 using ::testing::DoAll;
23 using ::testing::NiceMock; 23 using ::testing::NiceMock;
24 using ::testing::Return; 24 using ::testing::Return;
25 using ::testing::SetArgumentPointee; 25 using ::testing::SetArgPointee;
26 26
27 // Allows us to control which way the view is rendered. 27 // Allows us to control which way the view is rendered.
28 @interface DrawDetachedBarFakeController : 28 @interface DrawDetachedBarFakeController :
29 NSObject<BookmarkBarState, BookmarkBarToolbarViewController> { 29 NSObject<BookmarkBarState, BookmarkBarToolbarViewController> {
30 @private 30 @private
31 int currentTabContentsHeight_; 31 int currentTabContentsHeight_;
32 Profile* profile_; 32 Profile* profile_;
33 BookmarkBar::State state_; 33 BookmarkBar::State state_;
34 BOOL isEmpty_; 34 BOOL isEmpty_;
35 } 35 }
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
106 *arg1 = ThemeProperties::NO_REPEAT; 106 *arg1 = ThemeProperties::NO_REPEAT;
107 return true; 107 return true;
108 } 108 }
109 109
110 ACTION(SetAlignLeft) { 110 ACTION(SetAlignLeft) {
111 *arg1 = ThemeProperties::ALIGN_LEFT; 111 *arg1 = ThemeProperties::ALIGN_LEFT;
112 return true; 112 return true;
113 } 113 }
114 114
115 // TODO(viettrungluu): write more unit tests, especially after my refactoring. 115 // TODO(viettrungluu): write more unit tests, especially after my refactoring.
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698