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 "chrome/browser/profiles/profile.h" | 5 #include "chrome/browser/profiles/profile.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/files/scoped_temp_dir.h" | 8 #include "base/files/scoped_temp_dir.h" |
9 #include "base/platform_file.h" | 9 #include "base/platform_file.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
11 #include "base/version.h" | |
12 #include "chrome/browser/chrome_notification_types.h" | 11 #include "chrome/browser/chrome_notification_types.h" |
13 #include "chrome/browser/profiles/chrome_version_service.h" | 12 #include "chrome/browser/profiles/chrome_version_service.h" |
14 #include "chrome/browser/profiles/profile_impl.h" | 13 #include "chrome/browser/profiles/profile_impl.h" |
15 #include "chrome/browser/profiles/startup_task_runner_service.h" | 14 #include "chrome/browser/profiles/startup_task_runner_service.h" |
16 #include "chrome/browser/profiles/startup_task_runner_service_factory.h" | 15 #include "chrome/browser/profiles/startup_task_runner_service_factory.h" |
17 #include "chrome/common/chrome_constants.h" | 16 #include "chrome/common/chrome_constants.h" |
18 #include "chrome/common/chrome_version_info.h" | 17 #include "chrome/common/chrome_version_info.h" |
19 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.h" |
20 #include "chrome/test/base/in_process_browser_test.h" | 19 #include "chrome/test/base/in_process_browser_test.h" |
21 #include "chrome/test/base/ui_test_utils.h" | 20 #include "chrome/test/base/ui_test_utils.h" |
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
244 std::string final_value(prefs->GetString(prefs::kSessionExitType)); | 243 std::string final_value(prefs->GetString(prefs::kSessionExitType)); |
245 EXPECT_EQ(crash_value, final_value); | 244 EXPECT_EQ(crash_value, final_value); |
246 | 245 |
247 // This test runs fast enough that the WebDataService may still be | 246 // This test runs fast enough that the WebDataService may still be |
248 // initializing (which uses the temp directory) when the test | 247 // initializing (which uses the temp directory) when the test |
249 // ends. Give it a chance to complete. | 248 // ends. Give it a chance to complete. |
250 profile.reset(); | 249 profile.reset(); |
251 content::RunAllPendingInMessageLoop(); | 250 content::RunAllPendingInMessageLoop(); |
252 content::RunAllPendingInMessageLoop(content::BrowserThread::DB); | 251 content::RunAllPendingInMessageLoop(content::BrowserThread::DB); |
253 } | 252 } |
OLD | NEW |