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

Side by Side Diff: chrome/test/ui/ui_layout_test.h

Issue 232001: Resubmitting fix for 22174 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 11 years, 2 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/chrome.gyp ('k') | chrome/test/ui/ui_layout_test.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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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 #ifndef CHROME_TEST_UI_UI_LAYOUT_TEST_H_ 5 #ifndef CHROME_TEST_UI_UI_LAYOUT_TEST_H_
6 #define CHROME_TEST_UI_UI_LAYOUT_TEST_H_ 6 #define CHROME_TEST_UI_UI_LAYOUT_TEST_H_
7 7
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "chrome/test/ui/ui_test.h" 9 #include "chrome/test/ui/ui_test.h"
10 10
11 class UILayoutTest : public UITest { 11 class UILayoutTest : public UITest {
12 protected: 12 protected:
13 UILayoutTest(); 13 UILayoutTest();
14 virtual ~UILayoutTest(); 14 virtual ~UILayoutTest();
15 15
16 void InitializeForLayoutTest(const FilePath& test_parent_dir, 16 void InitializeForLayoutTest(const FilePath& test_parent_dir,
17 const FilePath& test_case_dir, 17 const FilePath& test_case_dir,
18 bool is_http_test); 18 bool is_http_test);
19 void AddResourceForLayoutTest(const FilePath& parent_dir,
20 const FilePath& resource_dir);
19 void RunLayoutTest(const std::string& test_case_file_name, 21 void RunLayoutTest(const std::string& test_case_file_name,
20 bool is_http_test); 22 bool is_http_test);
21 23
22 bool ReadExpectedResult(const FilePath& result_dir_path, 24 bool ReadExpectedResult(const FilePath& result_dir_path,
23 const std::string test_case_file_name, 25 const std::string test_case_file_name,
24 std::string* expected_result_value); 26 std::string* expected_result_value);
25 27
26 bool initialized_for_layout_test_; 28 bool initialized_for_layout_test_;
27 int test_count_; 29 int test_count_;
28 FilePath temp_test_dir_; 30 FilePath temp_test_dir_;
29 FilePath layout_test_dir_; 31 FilePath layout_test_dir_;
30 FilePath test_case_dir_; 32 FilePath test_case_dir_;
31 FilePath new_http_root_dir_; 33 FilePath new_http_root_dir_;
32 FilePath new_layout_test_dir_; 34 FilePath new_layout_test_dir_;
33 FilePath rebase_result_dir_; 35 FilePath rebase_result_dir_;
34 FilePath rebase_result_win_dir_; 36 FilePath rebase_result_win_dir_;
35 std::string layout_test_controller_; 37 std::string layout_test_controller_;
36 38
37 static const int kTestIntervalMs = 250; 39 static const int kTestIntervalMs = 250;
38 static const int kTestWaitTimeoutMs = 60 * 1000; 40 static const int kTestWaitTimeoutMs = 60 * 1000;
39 }; 41 };
40 42
41 #endif // CHROME_TEST_UI_UI_LAYOUT_TEST_H_ 43 #endif // CHROME_TEST_UI_UI_LAYOUT_TEST_H_
OLDNEW
« no previous file with comments | « chrome/chrome.gyp ('k') | chrome/test/ui/ui_layout_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698