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

Side by Side Diff: chrome/test/interactive_ui/fast_shutdown_interactive_uitest.cc

Issue 7532034: Move in_process_browser_test and ui_test_utils to chrome/test/base (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
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 "base/file_path.h" 5 #include "base/file_path.h"
6 #include "base/stl_util.h" 6 #include "base/stl_util.h"
7 #include "base/test/test_timeouts.h" 7 #include "base/test/test_timeouts.h"
8 #include "base/test/thread_test_helper.h" 8 #include "base/test/thread_test_helper.h"
9 #include "chrome/app/chrome_command_ids.h" 9 #include "chrome/app/chrome_command_ids.h"
10 #include "chrome/browser/net/sqlite_persistent_cookie_store.h" 10 #include "chrome/browser/net/sqlite_persistent_cookie_store.h"
11 #include "chrome/browser/ui/view_ids.h" 11 #include "chrome/browser/ui/view_ids.h"
12 #include "chrome/common/chrome_constants.h" 12 #include "chrome/common/chrome_constants.h"
13 #include "chrome/test/automation/automation_proxy.h" 13 #include "chrome/test/automation/automation_proxy.h"
14 #include "chrome/test/automation/browser_proxy.h" 14 #include "chrome/test/automation/browser_proxy.h"
15 #include "chrome/test/automation/tab_proxy.h" 15 #include "chrome/test/automation/tab_proxy.h"
16 #include "chrome/test/automation/window_proxy.h" 16 #include "chrome/test/automation/window_proxy.h"
17 #include "chrome/test/base/ui_test_utils.h"
17 #include "chrome/test/ui/ui_test.h" 18 #include "chrome/test/ui/ui_test.h"
18 #include "chrome/test/ui_test_utils.h"
19 #include "content/browser/browser_thread.h" 19 #include "content/browser/browser_thread.h"
20 #include "ui/base/events.h" 20 #include "ui/base/events.h"
21 #include "ui/base/message_box_flags.h" 21 #include "ui/base/message_box_flags.h"
22 #include "ui/gfx/rect.h" 22 #include "ui/gfx/rect.h"
23 23
24 class FastShutdown : public UITest { 24 class FastShutdown : public UITest {
25 }; 25 };
26 26
27 #if defined(OS_MACOSX) 27 #if defined(OS_MACOSX)
28 // SimulateOSClick is broken on the Mac: http://crbug.com/45162 28 // SimulateOSClick is broken on the Mac: http://crbug.com/45162
(...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 TestTimeouts::action_max_timeout_ms(), &exit_code)); 151 TestTimeouts::action_max_timeout_ms(), &exit_code));
152 HERE(24); 152 HERE(24);
153 EXPECT_EQ(0, exit_code); // Expect a clean shutdown. 153 EXPECT_EQ(0, exit_code); // Expect a clean shutdown.
154 154
155 // Read the cookie and check that it has the expected value. 155 // Read the cookie and check that it has the expected value.
156 GetCookie(user_data_dir(), cookie, &has_cookie, &cookie_value, thread_helper); 156 GetCookie(user_data_dir(), cookie, &has_cookie, &cookie_value, thread_helper);
157 HERE(25); 157 HERE(25);
158 EXPECT_TRUE(has_cookie); 158 EXPECT_TRUE(has_cookie);
159 EXPECT_EQ("ohyeah", cookie_value); 159 EXPECT_EQ("ohyeah", cookie_value);
160 } 160 }
OLDNEW
« no previous file with comments | « chrome/test/in_process_browser_test_browsertest.cc ('k') | chrome/test/interactive_ui/mouseleave_interactive_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698