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

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

Issue 131203005: Split WebRTC browser tests in getusermedia and peerconnection tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebased again :) Created 6 years, 11 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 | « content/browser/media/webrtc_getusermedia_browsertest.cc ('k') | content/content_tests.gypi » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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_WEBRTC_INTERNALS_H_ 5 #ifndef CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_
6 #define CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_ 6 #define CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_
7 7
8 #include "base/gtest_prod_util.h" 8 #include "base/gtest_prod_util.h"
9 #include "base/memory/singleton.h" 9 #include "base/memory/singleton.h"
10 #include "base/observer_list.h" 10 #include "base/observer_list.h"
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 } 94 }
95 95
96 base::FilePath aec_dump_file_path() { 96 base::FilePath aec_dump_file_path() {
97 return aec_dump_file_path_; 97 return aec_dump_file_path_;
98 } 98 }
99 99
100 void ResetForTesting(); 100 void ResetForTesting();
101 101
102 private: 102 private:
103 friend struct DefaultSingletonTraits<WebRTCInternals>; 103 friend struct DefaultSingletonTraits<WebRTCInternals>;
104 FRIEND_TEST_ALL_PREFIXES(WebrtcBrowserTest, CallWithAecDump); 104 FRIEND_TEST_ALL_PREFIXES(WebRtcBrowserTest, CallWithAecDump);
105 FRIEND_TEST_ALL_PREFIXES(WebrtcBrowserTest, 105 FRIEND_TEST_ALL_PREFIXES(WebRtcBrowserTest,
106 CallWithAecDumpEnabledThenDisabled); 106 CallWithAecDumpEnabledThenDisabled);
107 107
108 WebRTCInternals(); 108 WebRTCInternals();
109 virtual ~WebRTCInternals(); 109 virtual ~WebRTCInternals();
110 110
111 void SendUpdate(const std::string& command, base::Value* value); 111 void SendUpdate(const std::string& command, base::Value* value);
112 112
113 // BrowserChildProcessObserver implementation. 113 // BrowserChildProcessObserver implementation.
114 virtual void BrowserChildProcessCrashed( 114 virtual void BrowserChildProcessCrashed(
115 const ChildProcessData& data) OVERRIDE; 115 const ChildProcessData& data) OVERRIDE;
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
159 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 159 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
160 160
161 // AEC dump (diagnostic echo canceller recording) state. 161 // AEC dump (diagnostic echo canceller recording) state.
162 bool aec_dump_enabled_; 162 bool aec_dump_enabled_;
163 base::FilePath aec_dump_file_path_; 163 base::FilePath aec_dump_file_path_;
164 }; 164 };
165 165
166 } // namespace content 166 } // namespace content
167 167
168 #endif // CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_ 168 #endif // CONTENT_BROWSER_MEDIA_WEBRTC_INTERNALS_H_
OLDNEW
« no previous file with comments | « content/browser/media/webrtc_getusermedia_browsertest.cc ('k') | content/content_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698