| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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/lifetime/browser_close_manager.h" | 5 #include "chrome/browser/lifetime/browser_close_manager.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 #include <vector> | 8 #include <vector> |
| 9 | 9 |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 814 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 825 BrowserCloseManagerBrowserTest::SetUpOnMainThread(); | 825 BrowserCloseManagerBrowserTest::SetUpOnMainThread(); |
| 826 ASSERT_TRUE(scoped_download_directory_.CreateUniqueTempDir()); | 826 ASSERT_TRUE(scoped_download_directory_.CreateUniqueTempDir()); |
| 827 } | 827 } |
| 828 | 828 |
| 829 void SetDownloadPathForProfile(Profile* profile) { | 829 void SetDownloadPathForProfile(Profile* profile) { |
| 830 DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(profile); | 830 DownloadPrefs* download_prefs = DownloadPrefs::FromBrowserContext(profile); |
| 831 download_prefs->SetDownloadPath(download_path()); | 831 download_prefs->SetDownloadPath(download_path()); |
| 832 } | 832 } |
| 833 | 833 |
| 834 const base::FilePath& download_path() const { | 834 const base::FilePath& download_path() const { |
| 835 return scoped_download_directory_.path(); | 835 return scoped_download_directory_.GetPath(); |
| 836 } | 836 } |
| 837 | 837 |
| 838 private: | 838 private: |
| 839 base::ScopedTempDir scoped_download_directory_; | 839 base::ScopedTempDir scoped_download_directory_; |
| 840 }; | 840 }; |
| 841 | 841 |
| 842 // Mac has its own in-progress download prompt in app_controller_mac.mm, so | 842 // Mac has its own in-progress download prompt in app_controller_mac.mm, so |
| 843 // BrowserCloseManager should simply close all browsers. If there are no | 843 // BrowserCloseManager should simply close all browsers. If there are no |
| 844 // browsers, it should not crash. | 844 // browsers, it should not crash. |
| 845 #if defined(OS_MACOSX) | 845 #if defined(OS_MACOSX) |
| (...skipping 301 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1147 | 1147 |
| 1148 chrome::CloseAllBrowsers(); | 1148 chrome::CloseAllBrowsers(); |
| 1149 EXPECT_FALSE(browser_shutdown::IsTryingToQuit()); | 1149 EXPECT_FALSE(browser_shutdown::IsTryingToQuit()); |
| 1150 EXPECT_TRUE(BrowserList::GetInstance()->empty()); | 1150 EXPECT_TRUE(BrowserList::GetInstance()->empty()); |
| 1151 EXPECT_TRUE(IsBackgroundModeSuspended()); | 1151 EXPECT_TRUE(IsBackgroundModeSuspended()); |
| 1152 } | 1152 } |
| 1153 | 1153 |
| 1154 INSTANTIATE_TEST_CASE_P(BrowserCloseManagerWithBackgroundModeBrowserTest, | 1154 INSTANTIATE_TEST_CASE_P(BrowserCloseManagerWithBackgroundModeBrowserTest, |
| 1155 BrowserCloseManagerWithBackgroundModeBrowserTest, | 1155 BrowserCloseManagerWithBackgroundModeBrowserTest, |
| 1156 testing::Bool()); | 1156 testing::Bool()); |
| OLD | NEW |