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

Side by Side Diff: content/test/webrtc_audio_device_test.cc

Issue 143003031: Allow retrieval of media device ID salt even after ResourceContext has gone away. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add TODO about proper fix. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « content/public/browser/resource_context.h ('k') | no next file » | 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #include "content/test/webrtc_audio_device_test.h" 5 #include "content/test/webrtc_audio_device_test.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/bind_helpers.h" 8 #include "base/bind_helpers.h"
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
(...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 } 165 }
166 166
167 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE { 167 virtual bool AllowMicAccess(const GURL& origin) OVERRIDE {
168 return false; 168 return false;
169 } 169 }
170 170
171 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE { 171 virtual bool AllowCameraAccess(const GURL& origin) OVERRIDE {
172 return false; 172 return false;
173 } 173 }
174 174
175 virtual std::string GetMediaDeviceIDSalt() OVERRIDE {
176 return "";
177 }
178
179 private: 175 private:
180 net::URLRequestContext* test_request_context_; 176 net::URLRequestContext* test_request_context_;
181 177
182 DISALLOW_COPY_AND_ASSIGN(MockRTCResourceContext); 178 DISALLOW_COPY_AND_ASSIGN(MockRTCResourceContext);
183 }; 179 };
184 180
185 ACTION_P(QuitMessageLoop, loop_or_proxy) { 181 ACTION_P(QuitMessageLoop, loop_or_proxy) {
186 loop_or_proxy->PostTask(FROM_HERE, base::MessageLoop::QuitClosure()); 182 loop_or_proxy->PostTask(FROM_HERE, base::MessageLoop::QuitClosure());
187 } 183 }
188 184
(...skipping 255 matching lines...) Expand 10 before | Expand all | Expand 10 after
444 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) { 440 int WebRTCTransportImpl::SendPacket(int channel, const void* data, int len) {
445 return network_->ReceivedRTPPacket(channel, data, len); 441 return network_->ReceivedRTPPacket(channel, data, len);
446 } 442 }
447 443
448 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data, 444 int WebRTCTransportImpl::SendRTCPPacket(int channel, const void* data,
449 int len) { 445 int len) {
450 return network_->ReceivedRTCPPacket(channel, data, len); 446 return network_->ReceivedRTCPPacket(channel, data, len);
451 } 447 }
452 448
453 } // namespace content 449 } // namespace content
OLDNEW
« no previous file with comments | « content/public/browser/resource_context.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698