| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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/logging.h" | 5 #include "base/logging.h" |
| 6 #include "base/strings/stringprintf.h" | 6 #include "base/strings/stringprintf.h" |
| 7 #include "chrome/browser/download/chrome_download_manager_delegate.h" | 7 #include "chrome/browser/download/chrome_download_manager_delegate.h" |
| 8 #include "chrome/browser/download/download_service.h" | 8 #include "chrome/browser/download/download_service.h" |
| 9 #include "chrome/browser/download/download_service_factory.h" | 9 #include "chrome/browser/download/download_service_factory.h" |
| 10 #include "chrome/browser/profiles/profile_manager.h" | 10 #include "chrome/browser/profiles/profile_manager.h" |
| (...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 145 static_cast<TestingDownloadService*>(download_service)); | 145 static_cast<TestingDownloadService*>(download_service)); |
| 146 mock_download_service->SetDownloadCount(num_downloads); | 146 mock_download_service->SetDownloadCount(num_downloads); |
| 147 | 147 |
| 148 CHECK(browser_windows_.end() == browser_windows_.find(profile)); | 148 CHECK(browser_windows_.end() == browser_windows_.find(profile)); |
| 149 CHECK(browsers_.end() == browsers_.find(profile)); | 149 CHECK(browsers_.end() == browsers_.find(profile)); |
| 150 | 150 |
| 151 std::vector<TestBrowserWindow*> windows; | 151 std::vector<TestBrowserWindow*> windows; |
| 152 std::vector<Browser*> browsers; | 152 std::vector<Browser*> browsers; |
| 153 for (int i = 0; i < num_windows; ++i) { | 153 for (int i = 0; i < num_windows; ++i) { |
| 154 TestBrowserWindow* window = new TestBrowserWindow(); | 154 TestBrowserWindow* window = new TestBrowserWindow(); |
| 155 Browser::CreateParams params(profile, chrome::HOST_DESKTOP_TYPE_FIRST); | 155 Browser::CreateParams params(profile, ui::HOST_DESKTOP_TYPE_FIRST); |
| 156 params.type = Browser::TYPE_TABBED; | 156 params.type = Browser::TYPE_TABBED; |
| 157 params.window = window; | 157 params.window = window; |
| 158 Browser* browser = new Browser(params); | 158 Browser* browser = new Browser(params); |
| 159 | 159 |
| 160 windows.push_back(window); | 160 windows.push_back(window); |
| 161 browsers.push_back(browser); | 161 browsers.push_back(browser); |
| 162 } | 162 } |
| 163 | 163 |
| 164 browser_windows_[profile] = windows; | 164 browser_windows_[profile] = windows; |
| 165 browsers_[profile] = browsers; | 165 browsers_[profile] = browsers; |
| (...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 337 Profile* profile = CreateProfile(1, 0); | 337 Profile* profile = CreateProfile(1, 0); |
| 338 Profile* incognito_profile = CreateIncognitoProfile(profile, 1, 2); | 338 Profile* incognito_profile = CreateIncognitoProfile(profile, 1, 2); |
| 339 | 339 |
| 340 Browser* browser = GetProfileBrowser(incognito_profile, 0); | 340 Browser* browser = GetProfileBrowser(incognito_profile, 0); |
| 341 | 341 |
| 342 int num_downloads_blocking = 0; | 342 int num_downloads_blocking = 0; |
| 343 EXPECT_EQ(Browser::DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE, | 343 EXPECT_EQ(Browser::DOWNLOAD_CLOSE_LAST_WINDOW_IN_INCOGNITO_PROFILE, |
| 344 browser->OkToCloseWithInProgressDownloads(&num_downloads_blocking)); | 344 browser->OkToCloseWithInProgressDownloads(&num_downloads_blocking)); |
| 345 EXPECT_EQ(2, num_downloads_blocking); | 345 EXPECT_EQ(2, num_downloads_blocking); |
| 346 } | 346 } |
| OLD | NEW |