Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(239)

Side by Side Diff: chrome/test/ui/ui_test.cc

Issue 7537033: Move more files from chrome/test to chrome/test/base, part #5 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui/ui_perf_test.cc ('k') | content/renderer/external_popup_menu_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 26 matching lines...) Expand all
37 #include "chrome/common/chrome_switches.h" 37 #include "chrome/common/chrome_switches.h"
38 #include "chrome/common/logging_chrome.h" 38 #include "chrome/common/logging_chrome.h"
39 #include "chrome/common/url_constants.h" 39 #include "chrome/common/url_constants.h"
40 #include "chrome/test/automation/automation_proxy.h" 40 #include "chrome/test/automation/automation_proxy.h"
41 #include "chrome/test/automation/browser_proxy.h" 41 #include "chrome/test/automation/browser_proxy.h"
42 #include "chrome/test/automation/javascript_execution_controller.h" 42 #include "chrome/test/automation/javascript_execution_controller.h"
43 #include "chrome/test/automation/proxy_launcher.h" 43 #include "chrome/test/automation/proxy_launcher.h"
44 #include "chrome/test/automation/tab_proxy.h" 44 #include "chrome/test/automation/tab_proxy.h"
45 #include "chrome/test/automation/window_proxy.h" 45 #include "chrome/test/automation/window_proxy.h"
46 #include "chrome/test/base/chrome_process_util.h" 46 #include "chrome/test/base/chrome_process_util.h"
47 #include "chrome/test/test_switches.h" 47 #include "chrome/test/base/test_switches.h"
48 #include "content/common/debug_flags.h" 48 #include "content/common/debug_flags.h"
49 #include "content/common/json_value_serializer.h" 49 #include "content/common/json_value_serializer.h"
50 #include "googleurl/src/gurl.h" 50 #include "googleurl/src/gurl.h"
51 #include "net/base/net_util.h" 51 #include "net/base/net_util.h"
52 #include "ui/gfx/gl/gl_implementation.h" 52 #include "ui/gfx/gl/gl_implementation.h"
53 #include "ui/gfx/gl/gl_switches.h" 53 #include "ui/gfx/gl/gl_switches.h"
54 54
55 #if defined(OS_WIN) 55 #if defined(OS_WIN)
56 #include "base/win/windows_version.h" 56 #include "base/win/windows_version.h"
57 #endif 57 #endif
(...skipping 723 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms() / kCycles); 781 base::PlatformThread::Sleep(TestTimeouts::action_timeout_ms() / kCycles);
782 } 782 }
783 783
784 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF() 784 LOG(INFO) << "Elapsed time: " << (base::Time::Now() - start).InSecondsF()
785 << " seconds" 785 << " seconds"
786 << " call failed " << fail_count << " times" 786 << " call failed " << fail_count << " times"
787 << " state was incorrect " << incorrect_state_count << " times"; 787 << " state was incorrect " << incorrect_state_count << " times";
788 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__; 788 ADD_FAILURE() << "Timeout reached in " << __FUNCTION__;
789 return false; 789 return false;
790 } 790 }
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_perf_test.cc ('k') | content/renderer/external_popup_menu_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698