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

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller_browsertest.mm

Issue 1579863003: Convert Pass()→std::move() for Mac build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 11 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/extensions/extension_install_dialog_controller. h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller. h"
6 6
7 #include <utility>
8
7 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" 9 #include "chrome/browser/extensions/extension_install_prompt_show_params.h"
8 #include "chrome/browser/extensions/extension_install_prompt_test_helper.h" 10 #include "chrome/browser/extensions/extension_install_prompt_test_helper.h"
9 #include "chrome/browser/ui/browser.h" 11 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h" 12 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h"
11 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h" 13 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h"
12 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" 14 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 15 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/test/base/in_process_browser_test.h" 16 #include "chrome/test/base/in_process_browser_test.h"
15 #include "extensions/common/extension.h" 17 #include "extensions/common/extension.h"
16 18
(...skipping 13 matching lines...) Expand all
30 32
31 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) { 33 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) {
32 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); 34 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
33 ExtensionInstallPromptShowParams show_params(tab); 35 ExtensionInstallPromptShowParams show_params(tab);
34 36
35 ExtensionInstallPromptTestHelper test_helper; 37 ExtensionInstallPromptTestHelper test_helper;
36 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt = 38 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt =
37 chrome::BuildExtensionInstallPrompt(extension_.get()); 39 chrome::BuildExtensionInstallPrompt(extension_.get());
38 40
39 ExtensionInstallDialogController* controller = 41 ExtensionInstallDialogController* controller =
40 new ExtensionInstallDialogController(&show_params, 42 new ExtensionInstallDialogController(
41 test_helper.GetCallback(), 43 &show_params, test_helper.GetCallback(), std::move(prompt));
42 prompt.Pass());
43 44
44 base::scoped_nsobject<NSWindow> window( 45 base::scoped_nsobject<NSWindow> window(
45 [[[controller->view_controller() view] window] retain]); 46 [[[controller->view_controller() view] window] retain]);
46 EXPECT_TRUE([window isVisible]); 47 EXPECT_TRUE([window isVisible]);
47 48
48 // Press cancel to close the window. 49 // Press cancel to close the window.
49 [[controller->view_controller() cancelButton] performClick:nil]; 50 [[controller->view_controller() cancelButton] performClick:nil];
50 51
51 // Wait for the window to finish closing. 52 // Wait for the window to finish closing.
52 EXPECT_FALSE([window isVisible]); 53 EXPECT_FALSE([window isVisible]);
53 54
54 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, 55 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED,
55 test_helper.result()); 56 test_helper.result());
56 } 57 }
57 58
58 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, 59 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest,
59 DISABLED_Permissions) { 60 DISABLED_Permissions) {
60 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); 61 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
61 ExtensionInstallPromptShowParams show_params(tab); 62 ExtensionInstallPromptShowParams show_params(tab);
62 63
63 ExtensionInstallPromptTestHelper test_helper; 64 ExtensionInstallPromptTestHelper test_helper;
64 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt = 65 scoped_ptr<ExtensionInstallPrompt::Prompt> prompt =
65 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get()); 66 chrome::BuildExtensionPostInstallPermissionsPrompt(extension_.get());
66 67
67 ExtensionInstallDialogController* controller = 68 ExtensionInstallDialogController* controller =
68 new ExtensionInstallDialogController(&show_params, 69 new ExtensionInstallDialogController(
69 test_helper.GetCallback(), 70 &show_params, test_helper.GetCallback(), std::move(prompt));
70 prompt.Pass());
71 71
72 base::scoped_nsobject<NSWindow> window( 72 base::scoped_nsobject<NSWindow> window(
73 [[[controller->view_controller() view] window] retain]); 73 [[[controller->view_controller() view] window] retain]);
74 EXPECT_TRUE([window isVisible]); 74 EXPECT_TRUE([window isVisible]);
75 75
76 // Press cancel to close the window. 76 // Press cancel to close the window.
77 [[controller->view_controller() cancelButton] performClick:nil]; 77 [[controller->view_controller() cancelButton] performClick:nil];
78 78
79 // Wait for the window to finish closing. 79 // Wait for the window to finish closing.
80 EXPECT_FALSE([window isVisible]); 80 EXPECT_FALSE([window isVisible]);
81 81
82 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED, 82 EXPECT_EQ(ExtensionInstallPrompt::Result::USER_CANCELED,
83 test_helper.result()); 83 test_helper.result());
84 } 84 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698