| OLD | NEW |
| 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 #include "base/command_line.h" | 5 #include "base/command_line.h" |
| 6 #include "base/logging.h" | 6 #include "base/logging.h" |
| 7 #include "base/path_service.h" | 7 #include "base/path_service.h" |
| 8 #include "base/stringprintf.h" | 8 #include "base/stringprintf.h" |
| 9 #include "chrome/browser/browser_process.h" | 9 #include "chrome/browser/browser_process.h" |
| 10 #include "chrome/browser/download/download_service.h" | 10 #include "chrome/browser/download/download_service.h" |
| (...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 167 observer->WaitForFlush(); | 167 observer->WaitForFlush(); |
| 168 } | 168 } |
| 169 } | 169 } |
| 170 } | 170 } |
| 171 } | 171 } |
| 172 | 172 |
| 173 // Create a Browser (with associated window) on the specified profile. | 173 // Create a Browser (with associated window) on the specified profile. |
| 174 Browser* CreateBrowserOnProfile(Profile* profile) { | 174 Browser* CreateBrowserOnProfile(Profile* profile) { |
| 175 Browser* new_browser = new Browser(Browser::CreateParams(profile)); | 175 Browser* new_browser = new Browser(Browser::CreateParams(profile)); |
| 176 chrome::AddSelectedTabWithURL(new_browser, GURL(chrome::kAboutBlankURL), | 176 chrome::AddSelectedTabWithURL(new_browser, GURL(chrome::kAboutBlankURL), |
| 177 content::PAGE_TRANSITION_START_PAGE); | 177 content::PAGE_TRANSITION_AUTO_TOPLEVEL); |
| 178 content::WaitForLoadStop(chrome::GetActiveWebContents(new_browser)); | 178 content::WaitForLoadStop(chrome::GetActiveWebContents(new_browser)); |
| 179 new_browser->window()->Show(); | 179 new_browser->window()->Show(); |
| 180 return new_browser; | 180 return new_browser; |
| 181 } | 181 } |
| 182 | 182 |
| 183 // Adjust the number of browsers and associated windows up or down | 183 // Adjust the number of browsers and associated windows up or down |
| 184 // to |num_windows|. This routine assumes that there is only a single | 184 // to |num_windows|. This routine assumes that there is only a single |
| 185 // browser associated with the profile on entry. |*base_browser| contains | 185 // browser associated with the profile on entry. |*base_browser| contains |
| 186 // this browser, and the profile is derived from that browser. On output, | 186 // this browser, and the profile is derived from that browser. On output, |
| 187 // if |*base_browser| was destroyed (because |num_windows == 0|), NULL | 187 // if |*base_browser| was destroyed (because |num_windows == 0|), NULL |
| (...skipping 387 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 575 } | 575 } |
| 576 } | 576 } |
| 577 | 577 |
| 578 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) { | 578 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) { |
| 579 ASSERT_TRUE(SetupForDownloadCloseCheck()); | 579 ASSERT_TRUE(SetupForDownloadCloseCheck()); |
| 580 for (size_t i = 5 * arraysize(download_close_check_cases) / 6; | 580 for (size_t i = 5 * arraysize(download_close_check_cases) / 6; |
| 581 i < 6 * arraysize(download_close_check_cases) / 6; ++i) { | 581 i < 6 * arraysize(download_close_check_cases) / 6; ++i) { |
| 582 ExecuteDownloadCloseCheckCase(i); | 582 ExecuteDownloadCloseCheckCase(i); |
| 583 } | 583 } |
| 584 } | 584 } |
| OLD | NEW |