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

Side by Side Diff: content/browser/renderer_host/media/web_contents_video_capture_device_unittest.cc

Issue 19491004: Fix SessionStorage confusion between RenderViewHostImpl and NavigationController. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | content/browser/renderer_host/render_view_host_delegate.h » ('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) 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/browser/renderer_host/media/web_contents_video_capture_device. h" 5 #include "content/browser/renderer_host/media/web_contents_video_capture_device. h"
6 6
7 #include "base/bind_helpers.h" 7 #include "base/bind_helpers.h"
8 #include "base/debug/debugger.h" 8 #include "base/debug/debugger.h"
9 #include "base/run_loop.h" 9 #include "base/run_loop.h"
10 #include "base/test/test_timeouts.h" 10 #include "base/test/test_timeouts.h"
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after
285 UnregisterFactory(); 285 UnregisterFactory();
286 } 286 }
287 287
288 // RenderViewHostFactory implementation. 288 // RenderViewHostFactory implementation.
289 virtual RenderViewHost* CreateRenderViewHost( 289 virtual RenderViewHost* CreateRenderViewHost(
290 SiteInstance* instance, 290 SiteInstance* instance,
291 RenderViewHostDelegate* delegate, 291 RenderViewHostDelegate* delegate,
292 RenderWidgetHostDelegate* widget_delegate, 292 RenderWidgetHostDelegate* widget_delegate,
293 int routing_id, 293 int routing_id,
294 int main_frame_routing_id, 294 int main_frame_routing_id,
295 bool swapped_out, 295 bool swapped_out) OVERRIDE {
296 SessionStorageNamespace* session_storage_namespace) OVERRIDE {
297 return new CaptureTestRenderViewHost(instance, delegate, widget_delegate, 296 return new CaptureTestRenderViewHost(instance, delegate, widget_delegate,
298 routing_id, main_frame_routing_id, 297 routing_id, main_frame_routing_id,
299 swapped_out, controller_); 298 swapped_out, controller_);
300 } 299 }
301 private: 300 private:
302 CaptureTestSourceController* controller_; 301 CaptureTestSourceController* controller_;
303 302
304 DISALLOW_IMPLICIT_CONSTRUCTORS(CaptureTestRenderViewHostFactory); 303 DISALLOW_IMPLICIT_CONSTRUCTORS(CaptureTestRenderViewHostFactory);
305 }; 304 };
306 305
(...skipping 415 matching lines...) Expand 10 before | Expand all | Expand 10 after
722 ASSERT_NO_FATAL_FAILURE(consumer()->WaitForNextColor(SK_ColorGREEN)); 721 ASSERT_NO_FATAL_FAILURE(consumer()->WaitForNextColor(SK_ColorGREEN));
723 source()->SetSolidColor(SK_ColorRED); 722 source()->SetSolidColor(SK_ColorRED);
724 ASSERT_NO_FATAL_FAILURE(consumer()->WaitForNextColor(SK_ColorRED)); 723 ASSERT_NO_FATAL_FAILURE(consumer()->WaitForNextColor(SK_ColorRED));
725 724
726 device()->Stop(); 725 device()->Stop();
727 device()->DeAllocate(); 726 device()->DeAllocate();
728 } 727 }
729 728
730 } // namespace 729 } // namespace
731 } // namespace content 730 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/browser/renderer_host/render_view_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698