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/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
6 | 6 |
7 #if defined(OS_POSIX) | 7 #if defined(OS_POSIX) |
8 #include <signal.h> | 8 #include <signal.h> |
9 #include <sys/types.h> | 9 #include <sys/types.h> |
10 #endif | 10 #endif |
11 | 11 |
12 #include <set> | 12 #include <set> |
13 #include <vector> | 13 #include <vector> |
14 | 14 |
15 #include "base/base_switches.h" | 15 #include "base/base_switches.h" |
16 #include "base/bind.h" | 16 #include "base/bind.h" |
17 #include "base/command_line.h" | 17 #include "base/command_line.h" |
18 #include "base/environment.h" | 18 #include "base/environment.h" |
19 #include "base/file_util.h" | 19 #include "base/file_util.h" |
20 #include "base/files/file_enumerator.h" | 20 #include "base/files/file_enumerator.h" |
21 #include "base/files/file_path.h" | 21 #include "base/files/file_path.h" |
22 #include "base/files/scoped_temp_dir.h" | 22 #include "base/files/scoped_temp_dir.h" |
23 #include "base/json/json_file_value_serializer.h" | 23 #include "base/json/json_file_value_serializer.h" |
24 #include "base/logging.h" | 24 #include "base/logging.h" |
25 #include "base/memory/scoped_ptr.h" | 25 #include "base/memory/scoped_ptr.h" |
26 #include "base/path_service.h" | 26 #include "base/path_service.h" |
27 #include "base/process_util.h" | |
28 #include "base/strings/string_number_conversions.h" | 27 #include "base/strings/string_number_conversions.h" |
29 #include "base/strings/string_split.h" | 28 #include "base/strings/string_split.h" |
30 #include "base/strings/utf_string_conversions.h" | 29 #include "base/strings/utf_string_conversions.h" |
31 #include "base/test/test_file_util.h" | 30 #include "base/test/test_file_util.h" |
32 #include "base/test/test_timeouts.h" | 31 #include "base/test/test_timeouts.h" |
33 #include "base/threading/platform_thread.h" | 32 #include "base/threading/platform_thread.h" |
34 #include "base/time/time.h" | 33 #include "base/time/time.h" |
35 #include "chrome/app/chrome_command_ids.h" | 34 #include "chrome/app/chrome_command_ids.h" |
36 #include "chrome/browser/net/url_fixer_upper.h" | 35 #include "chrome/browser/net/url_fixer_upper.h" |
37 #include "chrome/browser/profiles/profile_impl.h" | 36 #include "chrome/browser/profiles/profile_impl.h" |
(...skipping 655 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
693 ASSERT_TRUE(session_end_completed); | 692 ASSERT_TRUE(session_end_completed); |
694 | 693 |
695 // Make sure session restore says we didn't crash. | 694 // Make sure session restore says we didn't crash. |
696 scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences()); | 695 scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences()); |
697 ASSERT_TRUE(profile_prefs.get()); | 696 ASSERT_TRUE(profile_prefs.get()); |
698 std::string exit_type; | 697 std::string exit_type; |
699 ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly, | 698 ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly, |
700 &exit_type)); | 699 &exit_type)); |
701 EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type); | 700 EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type); |
702 } | 701 } |
OLD | NEW |