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

Unified Diff: chrome/browser/managed_mode_unittest.cc

Issue 10692195: Consolidate Browser Creation. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/managed_mode_unittest.cc
===================================================================
--- chrome/browser/managed_mode_unittest.cc (revision 148382)
+++ chrome/browser/managed_mode_unittest.cc (working copy)
@@ -65,19 +65,16 @@
class MockBrowserWindow : public TestBrowserWindow {
public:
- explicit MockBrowserWindow(Browser* browser) : TestBrowserWindow(browser) {
- }
-
MOCK_METHOD0(Close, void());
};
class BrowserFixture {
public:
BrowserFixture(FakeManagedMode* managed_mode,
- TestingProfile* profile)
- : browser_(Browser::TYPE_TABBED, profile),
- window_(&browser_) {
- browser_.SetWindowForTesting(&window_);
+ TestingProfile* profile) {
+ Browser::CreateParams params(profile);
+ params.window = &window_;
+ browser_.reset(new Browser(params));
}
~BrowserFixture() {
@@ -88,7 +85,7 @@
}
private:
- Browser browser_;
+ scoped_ptr<Browser> browser_;
StrictMock<MockBrowserWindow> window_;
};
« no previous file with comments | « chrome/browser/extensions/extension_tab_util.cc ('k') | chrome/browser/notifications/notification_options_menu_model.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698