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

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

Issue 2543623003: media: Allow config change between clear and encrypted streams (Closed)
Patch Set: comments addressed Created 3 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
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 CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ 5 #ifndef CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
6 #define CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ 6 #define CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "chrome/test/base/in_process_browser_test.h" 10 #include "chrome/test/base/in_process_browser_test.h"
11 #include "content/public/browser/web_contents_observer.h" 11 #include "content/public/browser/web_contents_observer.h"
12 #include "media/base/test_data_util.h" 12 #include "media/base/test_data_util.h"
13 13
14 namespace content { 14 namespace content {
15 class TitleWatcher; 15 class TitleWatcher;
16 } 16 }
17 17
18 namespace chrome {
19
18 // Class used to automate running media related browser tests. The functions 20 // Class used to automate running media related browser tests. The functions
19 // assume that media files are located under media/ folder known to the test 21 // assume that media files are located under media/ folder known to the test
20 // http server. 22 // http server.
21 class MediaBrowserTest : public InProcessBrowserTest, 23 class MediaBrowserTest : public InProcessBrowserTest,
22 public content::WebContentsObserver { 24 public content::WebContentsObserver {
23 protected: 25 protected:
24 // Common test results. 26 // Common test results.
25 static const char kEnded[]; 27 static const char kEnded[];
26 // TODO(xhwang): Report detailed errors, e.g. "ERROR-3". 28 // TODO(xhwang): Report detailed errors, e.g. "ERROR-3".
27 static const char kError[]; 29 static const char kError[];
(...skipping 22 matching lines...) Expand all
50 void PluginCrashed(const base::FilePath& plugin_path, 52 void PluginCrashed(const base::FilePath& plugin_path,
51 base::ProcessId plugin_pid) override; 53 base::ProcessId plugin_pid) override;
52 54
53 // When called, the test will ignore any plugin crashes and not fail the test. 55 // When called, the test will ignore any plugin crashes and not fail the test.
54 void IgnorePluginCrash(); 56 void IgnorePluginCrash();
55 57
56 private: 58 private:
57 bool ignore_plugin_crash_; 59 bool ignore_plugin_crash_;
58 }; 60 };
59 61
62 } // namespace chrome
63
60 #endif // CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_ 64 #endif // CHROME_BROWSER_MEDIA_MEDIA_BROWSERTEST_H_
OLDNEW
« no previous file with comments | « chrome/browser/media/encrypted_media_browsertest.cc ('k') | chrome/browser/media/media_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698