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

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

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: try to fix android by restoring old path just for it Created 6 years, 9 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 | Annotate | Revision Log
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 "chrome/browser/ui/browser.h" 7 #include "chrome/browser/ui/browser.h"
8 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h" 8 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_sheet_co ntroller.h"
9 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h" 9 #import "chrome/browser/ui/cocoa/extensions/extension_install_prompt_test_utils. h"
10 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h" 10 #import "chrome/browser/ui/cocoa/extensions/extension_install_view_controller.h"
11 #include "chrome/browser/ui/tabs/tab_strip_model.h" 11 #include "chrome/browser/ui/tabs/tab_strip_model.h"
12 #include "chrome/test/base/in_process_browser_test.h" 12 #include "chrome/test/base/in_process_browser_test.h"
13 #include "extensions/common/extension.h" 13 #include "extensions/common/extension.h"
14 14
15 using extensions::Extension; 15 using extensions::Extension;
16 16
17 class ExtensionInstallDialogControllerTest : public InProcessBrowserTest { 17 class ExtensionInstallDialogControllerTest : public InProcessBrowserTest {
18 public: 18 public:
19 ExtensionInstallDialogControllerTest() { 19 ExtensionInstallDialogControllerTest() {}
20
21 virtual void SetUpOnMainThread() OVERRIDE {
20 extension_ = chrome::LoadInstallPromptExtension(); 22 extension_ = chrome::LoadInstallPromptExtension();
21 } 23 }
22 24
23 protected: 25 protected:
24 scoped_refptr<Extension> extension_; 26 scoped_refptr<Extension> extension_;
25 }; 27 };
26 28
27 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) { 29 IN_PROC_BROWSER_TEST_F(ExtensionInstallDialogControllerTest, BasicTest) {
28 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0); 30 content::WebContents* tab = browser()->tab_strip_model()->GetWebContentsAt(0);
29 ExtensionInstallPrompt::ShowParams show_params(tab); 31 ExtensionInstallPrompt::ShowParams show_params(tab);
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 base::scoped_nsobject<NSWindow> window( 67 base::scoped_nsobject<NSWindow> window(
66 [[[controller->view_controller() view] window] retain]); 68 [[[controller->view_controller() view] window] retain]);
67 EXPECT_TRUE([window isVisible]); 69 EXPECT_TRUE([window isVisible]);
68 70
69 // Press cancel to close the window 71 // Press cancel to close the window
70 [[controller->view_controller() cancelButton] performClick:nil]; 72 [[controller->view_controller() cancelButton] performClick:nil];
71 73
72 // Wait for the window to finish closing. 74 // Wait for the window to finish closing.
73 EXPECT_FALSE([window isVisible]); 75 EXPECT_FALSE([window isVisible]);
74 } 76 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698