Chromium Code Reviews| Index: ios/chrome/browser/ui/context_menu/context_menu_controller_unittest.mm |
| diff --git a/ui/base/ios/cru_context_menu_controller_unittest.mm b/ios/chrome/browser/ui/context_menu/context_menu_controller_unittest.mm |
| similarity index 70% |
| copy from ui/base/ios/cru_context_menu_controller_unittest.mm |
| copy to ios/chrome/browser/ui/context_menu/context_menu_controller_unittest.mm |
| index 31863d78648d010ef36bc05b6d90cbeb051cf2c7..391528f99fb8471753418fa2b64ceb84c17bbc2d 100644 |
| --- a/ui/base/ios/cru_context_menu_controller_unittest.mm |
| +++ b/ios/chrome/browser/ui/context_menu/context_menu_controller_unittest.mm |
| @@ -2,40 +2,42 @@ |
| // Use of this source code is governed by a BSD-style license that can be |
| // found in the LICENSE file. |
| -#import "ui/base/ios/cru_context_menu_controller.h" |
| +#import "ios/chrome/browser/ui/context_menu/context_menu_controller.h" |
| #import <UIKit/UIKit.h> |
| #include "base/mac/scoped_nsobject.h" |
| +#import "ios/chrome/browser/ui/context_menu/context_menu_holder.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "testing/platform_test.h" |
| -#import "ui/base/ios/cru_context_menu_holder.h" |
| namespace { |
| class ContextMenuControllerTest : public PlatformTest { |
| public: |
| - ContextMenuControllerTest() { } |
| + ContextMenuControllerTest() {} |
| void SetUp() override { |
| - _menuController.reset([[CRUContextMenuController alloc] init]); |
| + _menuController.reset([[ContextMenuController alloc] init]); |
|
sdefresne
2016/04/18 08:47:29
Another buggy test that forgot to call "PlaformTes
Jackie Quinn
2016/04/19 14:24:27
No problem, done!
|
| _window.reset( |
| [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]]); |
| [_window makeKeyAndVisible]; |
| } |
| protected: |
| - base::scoped_nsobject<CRUContextMenuController> _menuController; |
| + base::scoped_nsobject<ContextMenuController> _menuController; |
| base::scoped_nsobject<UIWindow> _window; |
| }; |
| TEST_F(ContextMenuControllerTest, OneEntry) { |
| - base::scoped_nsobject<CRUContextMenuHolder> holder( |
| - [[CRUContextMenuHolder alloc] init]); |
| + base::scoped_nsobject<ContextMenuHolder> holder( |
| + [[ContextMenuHolder alloc] init]); |
| BOOL clicked = NO; |
| BOOL* clickedPtr = &clicked; |
| - [holder appendItemWithTitle:@"foo" action:^{ *clickedPtr = YES; }]; |
| + [holder appendItemWithTitle:@"foo" action:^{ |
| + *clickedPtr = YES; |
| + }]; |
| [holder setMenuTitle:@"FooTitle"]; |
| [_menuController showWithHolder:holder atPoint:CGPointZero inView:_window]; |
| @@ -44,8 +46,8 @@ TEST_F(ContextMenuControllerTest, OneEntry) { |
| } |
| TEST_F(ContextMenuControllerTest, ShouldDismissImmediately) { |
| - base::scoped_nsobject<CRUContextMenuHolder> holder( |
| - [[CRUContextMenuHolder alloc] init]); |
| + base::scoped_nsobject<ContextMenuHolder> holder( |
| + [[ContextMenuHolder alloc] init]); |
| [holder appendItemWithTitle:@"foo" action:^{}]; |
| [holder appendItemWithTitle:@"bar" action:^{} dismissImmediately:YES]; |
| [holder appendItemWithTitle:@"baz" action:^{} dismissImmediately:NO]; |