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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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/startup/feature_startup_test.cc ('k') | chrome/test/ui_test_utils.h » ('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 // History UI tests 5 // History UI tests
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/test/test_timeouts.h" 8 #include "base/test/test_timeouts.h"
9 #include "chrome/browser/ui/view_ids.h" 9 #include "chrome/browser/ui/view_ids.h"
10 #include "chrome/test/automation/browser_proxy.h" 10 #include "chrome/test/automation/browser_proxy.h"
11 #include "chrome/test/automation/tab_proxy.h" 11 #include "chrome/test/automation/tab_proxy.h"
12 #include "chrome/test/automation/window_proxy.h" 12 #include "chrome/test/automation/window_proxy.h"
13 #include "chrome/test/ui/ui_test.h" 13 #include "chrome/test/ui/ui_test.h"
14 #include "chrome/test/ui_test_utils.h" 14 #include "chrome/test/ui_test_utils.h"
15 #include "gfx/rect.h" 15 #include "ui/gfx/rect.h"
16 #include "views/event.h" 16 #include "views/event.h"
17 17
18 namespace { 18 namespace {
19 19
20 const char kTestCompleteCookie[] = "status"; 20 const char kTestCompleteCookie[] = "status";
21 const char kTestCompleteSuccess[] = "OK"; 21 const char kTestCompleteSuccess[] = "OK";
22 const FilePath::CharType* kHistoryDir = FILE_PATH_LITERAL("History"); 22 const FilePath::CharType* kHistoryDir = FILE_PATH_LITERAL("History");
23 23
24 } // namespace 24 } // namespace
25 25
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
128 // the redirect is likely to be user-initiated. 128 // the redirect is likely to be user-initiated.
129 // Therefore, Page 21 should be in the history in addition to Page 22. 129 // Therefore, Page 21 should be in the history in addition to Page 22.
130 130
131 const FilePath test_case( 131 const FilePath test_case(
132 FILE_PATH_LITERAL("history_length_test_page_21.html")); 132 FILE_PATH_LITERAL("history_length_test_page_21.html"));
133 GURL url = ui_test_utils::GetTestUrl(FilePath(kHistoryDir), test_case); 133 GURL url = ui_test_utils::GetTestUrl(FilePath(kHistoryDir), test_case);
134 NavigateToURL(url); 134 NavigateToURL(url);
135 WaitForFinish("History_Length_Test_21", "1", url, kTestCompleteCookie, 135 WaitForFinish("History_Length_Test_21", "1", url, kTestCompleteCookie,
136 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms()); 136 kTestCompleteSuccess, TestTimeouts::action_max_timeout_ms());
137 } 137 }
OLDNEW
« no previous file with comments | « chrome/test/startup/feature_startup_test.cc ('k') | chrome/test/ui_test_utils.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698