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

Side by Side Diff: chrome/browser/ui/browser_close_browsertest.cc

Issue 10702029: Move tab functions off Browser into browser_tabstrip and browser_tabrestore. (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 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 #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"
11 #include "chrome/browser/download/download_service_factory.h" 11 #include "chrome/browser/download/download_service_factory.h"
12 #include "chrome/browser/download/download_test_observer.h" 12 #include "chrome/browser/download/download_test_observer.h"
13 #include "chrome/browser/net/url_request_mock_util.h" 13 #include "chrome/browser/net/url_request_mock_util.h"
14 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
15 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/profiles/profile_manager.h" 16 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_tabstrip.h"
18 #include "chrome/browser/ui/browser_window.h" 19 #include "chrome/browser/ui/browser_window.h"
19 #include "chrome/common/chrome_paths.h" 20 #include "chrome/common/chrome_paths.h"
20 #include "chrome/common/pref_names.h" 21 #include "chrome/common/pref_names.h"
21 #include "chrome/common/url_constants.h" 22 #include "chrome/common/url_constants.h"
22 #include "chrome/test/base/in_process_browser_test.h" 23 #include "chrome/test/base/in_process_browser_test.h"
23 #include "chrome/test/base/ui_test_utils.h" 24 #include "chrome/test/base/ui_test_utils.h"
24 #include "content/public/browser/download_item.h" 25 #include "content/public/browser/download_item.h"
25 #include "content/public/common/page_transition_types.h" 26 #include "content/public/common/page_transition_types.h"
26 #include "content/test/net/url_request_slow_download_job.h" 27 #include "content/test/net/url_request_slow_download_job.h"
27 28
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 new DownloadTestFlushObserver(mgr)); 164 new DownloadTestFlushObserver(mgr));
164 observer->WaitForFlush(); 165 observer->WaitForFlush();
165 } 166 }
166 } 167 }
167 } 168 }
168 } 169 }
169 170
170 // Create a Browser (with associated window) on the specified profile. 171 // Create a Browser (with associated window) on the specified profile.
171 Browser* CreateBrowserOnProfile(Profile* profile) { 172 Browser* CreateBrowserOnProfile(Profile* profile) {
172 Browser* new_browser = Browser::Create(profile); 173 Browser* new_browser = Browser::Create(profile);
173 new_browser->AddSelectedTabWithURL(GURL(chrome::kAboutBlankURL), 174 chrome::AddSelectedTabWithURL(new_browser, GURL(chrome::kAboutBlankURL),
174 content::PAGE_TRANSITION_START_PAGE); 175 content::PAGE_TRANSITION_START_PAGE);
175 ui_test_utils::WaitForLoadStop( 176 ui_test_utils::WaitForLoadStop(
176 new_browser->GetActiveWebContents()); 177 chrome::GetActiveWebContents(new_browser));
177 new_browser->window()->Show(); 178 new_browser->window()->Show();
178 return new_browser; 179 return new_browser;
179 } 180 }
180 181
181 // Adjust the number of browsers and associated windows up or down 182 // Adjust the number of browsers and associated windows up or down
182 // to |num_windows|. This routine assumes that there is only a single 183 // to |num_windows|. This routine assumes that there is only a single
183 // browser associated with the profile on entry. |*base_browser| contains 184 // browser associated with the profile on entry. |*base_browser| contains
184 // this browser, and the profile is derived from that browser. On output, 185 // this browser, and the profile is derived from that browser. On output,
185 // if |*base_browser| was destroyed (because |num_windows == 0|), NULL 186 // if |*base_browser| was destroyed (because |num_windows == 0|), NULL
186 // is assigned to that memory location. 187 // is assigned to that memory location.
(...skipping 380 matching lines...) Expand 10 before | Expand all | Expand 10 after
567 } 568 }
568 } 569 }
569 570
570 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) { 571 IN_PROC_BROWSER_TEST_F(BrowserCloseTest, MAYBE_DownloadsCloseCheck_5) {
571 ASSERT_TRUE(SetupForDownloadCloseCheck()); 572 ASSERT_TRUE(SetupForDownloadCloseCheck());
572 for (size_t i = 5 * arraysize(download_close_check_cases) / 6; 573 for (size_t i = 5 * arraysize(download_close_check_cases) / 6;
573 i < 6 * arraysize(download_close_check_cases) / 6; ++i) { 574 i < 6 * arraysize(download_close_check_cases) / 6; ++i) {
574 ExecuteDownloadCloseCheckCase(i); 575 ExecuteDownloadCloseCheckCase(i);
575 } 576 }
576 } 577 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser_browsertest.cc ('k') | chrome/browser/ui/browser_command_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698