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 |
(...skipping 30 matching lines...) Expand all Loading... |
41 #include "chrome/common/url_constants.h" | 41 #include "chrome/common/url_constants.h" |
42 #include "chrome/test/automation/automation_proxy.h" | 42 #include "chrome/test/automation/automation_proxy.h" |
43 #include "chrome/test/automation/browser_proxy.h" | 43 #include "chrome/test/automation/browser_proxy.h" |
44 #include "chrome/test/automation/proxy_launcher.h" | 44 #include "chrome/test/automation/proxy_launcher.h" |
45 #include "chrome/test/automation/tab_proxy.h" | 45 #include "chrome/test/automation/tab_proxy.h" |
46 #include "chrome/test/automation/window_proxy.h" | 46 #include "chrome/test/automation/window_proxy.h" |
47 #include "chrome/test/base/chrome_process_util.h" | 47 #include "chrome/test/base/chrome_process_util.h" |
48 #include "chrome/test/base/testing_profile.h" | 48 #include "chrome/test/base/testing_profile.h" |
49 #include "chrome/test/base/test_launcher_utils.h" | 49 #include "chrome/test/base/test_launcher_utils.h" |
50 #include "chrome/test/base/test_switches.h" | 50 #include "chrome/test/base/test_switches.h" |
51 #include "content/common/debug_flags.h" | |
52 #include "googleurl/src/gurl.h" | 51 #include "googleurl/src/gurl.h" |
53 #include "net/base/net_util.h" | 52 #include "net/base/net_util.h" |
54 #include "ui/gl/gl_implementation.h" | 53 #include "ui/gl/gl_implementation.h" |
55 | 54 |
56 #if defined(OS_WIN) | 55 #if defined(OS_WIN) |
57 #include "base/win/windows_version.h" | 56 #include "base/win/windows_version.h" |
58 #endif | 57 #endif |
59 | 58 |
60 #if defined(USE_AURA) | 59 #if defined(USE_AURA) |
61 #include "ui/compositor/compositor_switches.h" | 60 #include "ui/compositor/compositor_switches.h" |
(...skipping 654 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
716 &session_end_completed)); | 715 &session_end_completed)); |
717 ASSERT_TRUE(session_end_completed); | 716 ASSERT_TRUE(session_end_completed); |
718 | 717 |
719 // Make sure session restore says we didn't crash. | 718 // Make sure session restore says we didn't crash. |
720 scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences()); | 719 scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences()); |
721 ASSERT_TRUE(profile_prefs.get()); | 720 ASSERT_TRUE(profile_prefs.get()); |
722 ASSERT_TRUE(profile_prefs->GetBoolean(prefs::kSessionExitedCleanly, | 721 ASSERT_TRUE(profile_prefs->GetBoolean(prefs::kSessionExitedCleanly, |
723 &exited_cleanly)); | 722 &exited_cleanly)); |
724 ASSERT_TRUE(exited_cleanly); | 723 ASSERT_TRUE(exited_cleanly); |
725 } | 724 } |
OLD | NEW |