OLD | NEW |
---|---|
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ | 5 #ifndef CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ |
6 #define CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ | 6 #define CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ |
7 | 7 |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "content/public/test/content_browser_test.h" | 11 #include "content/public/test/content_browser_test.h" |
12 | 12 |
13 namespace content { | 13 namespace content { |
14 | 14 |
15 class TitleWatcher; | 15 class TitleWatcher; |
16 | 16 |
17 // Class used to automate running media related browser tests. The functions | 17 // Class used to automate running media related browser tests. The functions |
18 // assume that media files are located under files/media/ folder known to | 18 // assume that media files are located under files/media/ folder known to |
19 // the test http server. | 19 // the test http server. |
20 class MediaBrowserTest : public ContentBrowserTest { | 20 class MediaBrowserTest : public ContentBrowserTest { |
21 public: | 21 public: |
22 typedef std::pair<const char*, const char*> StringPair; | 22 typedef std::pair<std::string, std::string> StringPair; |
23 | 23 |
24 // Common test results. | 24 // Common test results. |
25 static const char kEnded[]; | 25 static const char kEnded[]; |
jrummell
2014/07/02 00:33:40
Should these be std::string since |expected| below
shadi
2014/07/02 19:23:36
I believe I had this conversation with xhwang some
| |
26 static const char kError[]; | 26 static const char kError[]; |
27 static const char kFailed[]; | 27 static const char kFailed[]; |
28 | 28 |
29 // Runs a html page with a list of URL query parameters. | 29 // Runs a html page with a list of URL query parameters. |
30 // If http is true, the test starts a local http test server to load the test | 30 // If http is true, the test starts a local http test server to load the test |
31 // page, otherwise a local file URL is loaded inside the content shell. | 31 // page, otherwise a local file URL is loaded inside the content shell. |
32 // It uses RunTest() to check for expected test output. | 32 // It uses RunTest() to check for expected test output. |
33 void RunMediaTestPage(const char* html_page, | 33 void RunMediaTestPage(const std::string& html_page, |
34 std::vector<StringPair>* query_params, | 34 std::vector<StringPair>* query_params, |
35 const char* expected, bool http); | 35 const std::string& expected, bool http); |
36 | 36 |
37 // Opens a URL and waits for the document title to match either one of the | 37 // Opens a URL and waits for the document title to match either one of the |
38 // default strings or the expected string. | 38 // default strings or the expected string. |
39 void RunTest(const GURL& gurl, const char* expected); | 39 base::string16 RunTest(const GURL& gurl, const std::string& expected); |
jrummell
2014/07/02 00:33:40
Can the return value be std::string as well? I don
shadi
2014/07/02 19:23:36
Yeah, I don't see a problem converting title watch
| |
40 | 40 |
41 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher); | 41 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher); |
42 }; | 42 }; |
43 | 43 |
44 } // namespace content | 44 } // namespace content |
45 | 45 |
46 #endif // CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ | 46 #endif // CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ |
OLD | NEW |