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

Side by Side Diff: content/browser/media/media_browsertest.h

Issue 593023002: Use base::StringPairs where appropriate for src/media/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 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
OLDNEW
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 <string> 8 #include <string>
9 9
10 #include "content/public/test/content_browser_test.h" 10 #include "content/public/test/content_browser_test.h"
(...skipping 11 matching lines...) Expand all
22 // Common test results. 22 // Common test results.
23 static const char kEnded[]; 23 static const char kEnded[];
24 static const char kError[]; 24 static const char kError[];
25 static const char kFailed[]; 25 static const char kFailed[];
26 26
27 // Runs a html page with a list of URL query parameters. 27 // Runs a html page with a list of URL query parameters.
28 // If http is true, the test starts a local http test server to load the test 28 // If http is true, the test starts a local http test server to load the test
29 // page, otherwise a local file URL is loaded inside the content shell. 29 // page, otherwise a local file URL is loaded inside the content shell.
30 // It uses RunTest() to check for expected test output. 30 // It uses RunTest() to check for expected test output.
31 void RunMediaTestPage(const std::string& html_page, 31 void RunMediaTestPage(const std::string& html_page,
32 const media::QueryParams& query_params, 32 const base::StringPairs& query_params,
33 const std::string& expected, 33 const std::string& expected,
34 bool http); 34 bool http);
35 35
36 // Opens a URL and waits for the document title to match either one of the 36 // Opens a URL and waits for the document title to match either one of the
37 // default strings or the expected string. Returns the matching title value. 37 // default strings or the expected string. Returns the matching title value.
38 std::string RunTest(const GURL& gurl, const std::string& expected); 38 std::string RunTest(const GURL& gurl, const std::string& expected);
39 39
40 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher); 40 virtual void AddWaitForTitles(content::TitleWatcher* title_watcher);
41 }; 41 };
42 42
43 } // namespace content 43 } // namespace content
44 44
45 #endif // CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ 45 #endif // CONTENT_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
OLDNEW
« no previous file with comments | « content/browser/media/encrypted_media_browsertest.cc ('k') | content/browser/media/media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698