summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/panels
diff options
context:
space:
mode:
authorrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 01:23:38 +0000
committerrsesek@chromium.org <rsesek@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-09 01:23:38 +0000
commitd4d4a07cba941300ea6b5f5ed5a5d7ce413c3267 (patch)
tree01cd085b948a443eabc4d6060c6f7690efdfcfc4 /chrome/browser/ui/panels
parent959130f594bec089c476ebe641da55f6ca55af8c (diff)
downloadchromium_src-d4d4a07cba941300ea6b5f5ed5a5d7ce413c3267.zip
chromium_src-d4d4a07cba941300ea6b5f5ed5a5d7ce413c3267.tar.gz
chromium_src-d4d4a07cba941300ea6b5f5ed5a5d7ce413c3267.tar.bz2
Switch BrowserTestHelper to use TestingProfileManager and update all corresponding tests.
BUG=none TEST=unit_tests Review URL: http://codereview.chromium.org/7825005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100313 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/panels')
-rw-r--r--chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm14
1 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm b/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm
index 781e6ec..db957ad 100644
--- a/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm
+++ b/chrome/browser/ui/panels/panel_browser_window_cocoa_unittest.mm
@@ -14,9 +14,8 @@
#include "chrome/app/chrome_command_ids.h" // IDC_*
#include "chrome/browser/ui/browser.h"
#include "chrome/browser/ui/browser_list.h"
-#import "chrome/browser/ui/cocoa/browser_test_helper.h"
#import "chrome/browser/ui/cocoa/browser_window_utils.h"
-#import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
+#include "chrome/browser/ui/cocoa/cocoa_profile_test.h"
#import "chrome/browser/ui/cocoa/run_loop_testing.h"
#include "chrome/browser/ui/panels/panel.h"
#include "chrome/browser/ui/panels/panel_manager.h"
@@ -31,10 +30,10 @@
#include "testing/gtest_mac.h"
// Main test class.
-class PanelBrowserWindowCocoaTest : public CocoaTest {
+class PanelBrowserWindowCocoaTest : public CocoaProfileTest {
public:
virtual void SetUp() {
- CocoaTest::SetUp();
+ CocoaProfileTest::SetUp();
CommandLine::ForCurrentProcess()->AppendSwitch(switches::kEnablePanels);
}
@@ -50,10 +49,10 @@ class PanelBrowserWindowCocoaTest : public CocoaTest {
Browser* panel_browser = Browser::CreateForApp(Browser::TYPE_PANEL,
panel_name,
gfx::Rect(),
- browser_helper_.profile());
+ profile());
TabContentsWrapper* tab_contents = new TabContentsWrapper(
- new TestTabContents(browser_helper_.profile(), NULL));
+ new TestTabContents(profile(), NULL));
panel_browser->AddTab(tab_contents, PageTransition::LINK);
// We just created one new panel.
@@ -111,9 +110,6 @@ class PanelBrowserWindowCocoaTest : public CocoaTest {
[item setTag:command_id];
return item;
}
-
- private:
- BrowserTestHelper browser_helper_;
};
TEST_F(PanelBrowserWindowCocoaTest, CreateClose) {