OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h" | 5 #include "chrome/browser/ui/startup/session_crashed_infobar_delegate.h" |
6 | 6 |
7 #include "base/files/scoped_temp_dir.h" | 7 #include "base/files/scoped_temp_dir.h" |
8 #include "base/run_loop.h" | 8 #include "base/run_loop.h" |
9 #include "chrome/browser/infobars/infobar_service.h" | 9 #include "chrome/browser/infobars/infobar_service.h" |
10 #include "chrome/browser/prefs/browser_prefs.h" | 10 #include "chrome/browser/prefs/browser_prefs.h" |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
49 }; | 49 }; |
50 | 50 |
51 TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) { | 51 TEST_F(SessionCrashedInfoBarDelegateUnitTest, DetachingTabWithCrashedInfoBar) { |
52 SessionServiceFactory::SetForTestProfile( | 52 SessionServiceFactory::SetForTestProfile( |
53 browser()->profile(), | 53 browser()->profile(), |
54 make_scoped_ptr(static_cast<SessionService*>( | 54 make_scoped_ptr(static_cast<SessionService*>( |
55 SessionServiceFactory::GetInstance()->BuildServiceInstanceFor( | 55 SessionServiceFactory::GetInstance()->BuildServiceInstanceFor( |
56 browser()->profile())))); | 56 browser()->profile())))); |
57 | 57 |
58 // Create a browser which we can close during the test. | 58 // Create a browser which we can close during the test. |
59 Browser::CreateParams params(browser()->profile(), | 59 Browser::CreateParams params(browser()->profile()); |
60 browser()->host_desktop_type()); | |
61 scoped_ptr<Browser> first_browser( | 60 scoped_ptr<Browser> first_browser( |
62 chrome::CreateBrowserWithTestWindowForParams(¶ms)); | 61 chrome::CreateBrowserWithTestWindowForParams(¶ms)); |
63 AddTab(first_browser.get(), GURL(chrome::kChromeUINewTabURL)); | 62 AddTab(first_browser.get(), GURL(chrome::kChromeUINewTabURL)); |
64 | 63 |
65 // Attach the crashed infobar to it. | 64 // Attach the crashed infobar to it. |
66 SessionCrashedInfoBarDelegate::Create(first_browser.get()); | 65 SessionCrashedInfoBarDelegate::Create(first_browser.get()); |
67 | 66 |
68 TabStripModel* tab_strip = first_browser->tab_strip_model(); | 67 TabStripModel* tab_strip = first_browser->tab_strip_model(); |
69 ASSERT_EQ(1, tab_strip->count()); | 68 ASSERT_EQ(1, tab_strip->count()); |
70 content::WebContents* web_contents = tab_strip->GetWebContentsAt(0); | 69 content::WebContents* web_contents = tab_strip->GetWebContentsAt(0); |
(...skipping 21 matching lines...) Expand all Loading... |
92 infobar_service = | 91 infobar_service = |
93 InfoBarService::FromWebContents(tab_strip->GetWebContentsAt(0)); | 92 InfoBarService::FromWebContents(tab_strip->GetWebContentsAt(0)); |
94 EXPECT_EQ(1U, infobar_service->infobar_count()); | 93 EXPECT_EQ(1U, infobar_service->infobar_count()); |
95 | 94 |
96 // This used to crash. | 95 // This used to crash. |
97 infobar->Accept(); | 96 infobar->Accept(); |
98 | 97 |
99 // Ramp down the test. | 98 // Ramp down the test. |
100 tab_strip->CloseWebContentsAt(0, TabStripModel::CLOSE_NONE); | 99 tab_strip->CloseWebContentsAt(0, TabStripModel::CLOSE_NONE); |
101 } | 100 } |
OLD | NEW |