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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
509 launch_arguments_.AppendSwitchASCII(name, value); | 509 launch_arguments_.AppendSwitchASCII(name, value); |
510 } | 510 } |
511 | 511 |
512 bool UITestBase::BeginTracing(const std::string& categories) { | 512 bool UITestBase::BeginTracing(const std::string& categories) { |
513 return automation()->BeginTracing(categories); | 513 return automation()->BeginTracing(categories); |
514 } | 514 } |
515 | 515 |
516 std::string UITestBase::EndTracing() { | 516 std::string UITestBase::EndTracing() { |
517 std::string json_trace_output; | 517 std::string json_trace_output; |
518 if (!automation()->EndTracing(&json_trace_output)) | 518 if (!automation()->EndTracing(&json_trace_output)) |
519 return ""; | 519 return std::string(); |
520 return json_trace_output; | 520 return json_trace_output; |
521 } | 521 } |
522 | 522 |
523 // UITest methods | 523 // UITest methods |
524 | 524 |
525 void UITest::SetUp() { | 525 void UITest::SetUp() { |
526 // Pass the test case name to chrome.exe on the command line to help with | 526 // Pass the test case name to chrome.exe on the command line to help with |
527 // parsing Purify output. | 527 // parsing Purify output. |
528 const testing::TestInfo* const test_info = | 528 const testing::TestInfo* const test_info = |
529 testing::UnitTest::GetInstance()->current_test_info(); | 529 testing::UnitTest::GetInstance()->current_test_info(); |
(...skipping 191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
721 ASSERT_TRUE(session_end_completed); | 721 ASSERT_TRUE(session_end_completed); |
722 | 722 |
723 // Make sure session restore says we didn't crash. | 723 // Make sure session restore says we didn't crash. |
724 scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences()); | 724 scoped_ptr<DictionaryValue> profile_prefs(GetDefaultProfilePreferences()); |
725 ASSERT_TRUE(profile_prefs.get()); | 725 ASSERT_TRUE(profile_prefs.get()); |
726 std::string exit_type; | 726 std::string exit_type; |
727 ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly, | 727 ASSERT_TRUE(profile_prefs->GetString(prefs::kSessionExitedCleanly, |
728 &exit_type)); | 728 &exit_type)); |
729 EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type); | 729 EXPECT_EQ(ProfileImpl::kPrefExitTypeNormal, exit_type); |
730 } | 730 } |
OLD | NEW |