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

Side by Side Diff: content/shell/renderer/test_runner/web_frame_test_proxy.h

Issue 381683003: Fix enable_webrtc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove content_tests when enable_webrtc = 1 Created 6 years, 5 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
« no previous file with comments | « content/content_common.gypi ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 5 #ifndef CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 6 #define CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
7 7
8 #include "base/basictypes.h" 8 #include "base/basictypes.h"
9 #include "content/shell/renderer/test_runner/TestInterfaces.h" 9 #include "content/shell/renderer/test_runner/TestInterfaces.h"
10 #include "content/shell/renderer/test_runner/WebTestDelegate.h" 10 #include "content/shell/renderer/test_runner/WebTestDelegate.h"
(...skipping 263 matching lines...) Expand 10 before | Expand all | Expand 10 after
274 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame, 274 return Base::willCheckAndDispatchMessageEvent(sourceFrame, targetFrame,
275 target, event); 275 target, event);
276 } 276 }
277 277
278 virtual void didStopLoading() { 278 virtual void didStopLoading() {
279 base_proxy_->DidStopLoading(); 279 base_proxy_->DidStopLoading();
280 Base::didStopLoading(); 280 Base::didStopLoading();
281 } 281 }
282 282
283 private: 283 private:
284 #if defined(ENABLE_WEBRTC)
284 virtual scoped_ptr<MediaStreamRendererFactory> 285 virtual scoped_ptr<MediaStreamRendererFactory>
285 CreateRendererFactory() OVERRIDE { 286 CreateRendererFactory() OVERRIDE {
286 return scoped_ptr<MediaStreamRendererFactory>( 287 return scoped_ptr<MediaStreamRendererFactory>(
287 new TestMediaStreamRendererFactory()); 288 new TestMediaStreamRendererFactory());
288 } 289 }
290 #endif
289 291
290 WebTestProxyBase* base_proxy_; 292 WebTestProxyBase* base_proxy_;
291 293
292 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy); 294 DISALLOW_COPY_AND_ASSIGN(WebFrameTestProxy);
293 }; 295 };
294 296
295 } // namespace content 297 } // namespace content
296 298
297 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_ 299 #endif // CONTENT_SHELL_RENDERER_TEST_RUNNER_WEB_FRAME_TEST_PROXY_H_
OLDNEW
« no previous file with comments | « content/content_common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698