OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 CONTENT_SHELL_BROWSER_LAYOUT_TEST_TEST_INFO_EXTRACTOR_H_ | 5 #ifndef CONTENT_SHELL_BROWSER_LAYOUT_TEST_TEST_INFO_EXTRACTOR_H_ |
6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_TEST_INFO_EXTRACTOR_H_ | 6 #define CONTENT_SHELL_BROWSER_LAYOUT_TEST_TEST_INFO_EXTRACTOR_H_ |
7 | 7 |
8 #include <stddef.h> | 8 #include <stddef.h> |
9 | 9 |
| 10 #include <memory> |
10 #include <string> | 11 #include <string> |
11 | 12 |
12 #include "base/command_line.h" | 13 #include "base/command_line.h" |
13 #include "base/files/file_path.h" | 14 #include "base/files/file_path.h" |
14 #include "base/macros.h" | 15 #include "base/macros.h" |
15 #include "url/gurl.h" | 16 #include "url/gurl.h" |
16 | 17 |
17 namespace content { | 18 namespace content { |
18 | 19 |
19 struct TestInfo { | 20 struct TestInfo { |
20 TestInfo(const GURL& url, | 21 TestInfo(const GURL& url, |
21 bool enable_pixel_dumping, | 22 bool enable_pixel_dumping, |
22 const std::string& expected_pixel_hash, | 23 const std::string& expected_pixel_hash, |
23 const base::FilePath& current_working_directory); | 24 const base::FilePath& current_working_directory); |
24 ~TestInfo(); | 25 ~TestInfo(); |
25 | 26 |
26 GURL url; | 27 GURL url; |
27 bool enable_pixel_dumping; | 28 bool enable_pixel_dumping; |
28 std::string expected_pixel_hash; | 29 std::string expected_pixel_hash; |
29 base::FilePath current_working_directory; | 30 base::FilePath current_working_directory; |
30 }; | 31 }; |
31 | 32 |
32 class TestInfoExtractor { | 33 class TestInfoExtractor { |
33 public: | 34 public: |
34 explicit TestInfoExtractor(const base::CommandLine::StringVector& cmd_args); | 35 explicit TestInfoExtractor(const base::CommandLine::StringVector& cmd_args); |
35 ~TestInfoExtractor(); | 36 ~TestInfoExtractor(); |
36 | 37 |
37 scoped_ptr<TestInfo> GetNextTest(); | 38 std::unique_ptr<TestInfo> GetNextTest(); |
38 | 39 |
39 private: | 40 private: |
40 base::CommandLine::StringVector cmdline_args_; | 41 base::CommandLine::StringVector cmdline_args_; |
41 size_t cmdline_position_; | 42 size_t cmdline_position_; |
42 | 43 |
43 DISALLOW_COPY_AND_ASSIGN(TestInfoExtractor); | 44 DISALLOW_COPY_AND_ASSIGN(TestInfoExtractor); |
44 }; | 45 }; |
45 | 46 |
46 } // namespace content | 47 } // namespace content |
47 | 48 |
48 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_TEST_INFO_EXTRACTOR_H_ | 49 #endif // CONTENT_SHELL_BROWSER_LAYOUT_TEST_TEST_INFO_EXTRACTOR_H_ |
OLD | NEW |