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

Unified Diff: content/test/webrtc_audio_device_test.h

Issue 11346016: Move remaining content test code into the content namespace. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/test/test_web_contents_view.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/test/webrtc_audio_device_test.h
===================================================================
--- content/test/webrtc_audio_device_test.h (revision 164732)
+++ content/test/webrtc_audio_device_test.h (working copy)
@@ -159,14 +159,14 @@
scoped_ptr<ReplaceContentClientRenderer> saved_content_renderer_;
MessageLoopForUI message_loop_;
- content::ContentRendererClient content_renderer_client_;
+ ContentRendererClient content_renderer_client_;
RenderThreadImpl* render_thread_; // Owned by mock_process_.
scoped_ptr<WebRTCMockRenderProcess> mock_process_;
scoped_ptr<MockMediaObserver> media_observer_;
scoped_ptr<MediaStreamManager> media_stream_manager_;
scoped_ptr<media::AudioManager> audio_manager_;
scoped_ptr<net::URLRequestContext> test_request_context_;
- scoped_ptr<content::ResourceContext> resource_context_;
+ scoped_ptr<ResourceContext> resource_context_;
scoped_ptr<IPC::Channel> channel_;
scoped_refptr<AudioRendererHost> audio_render_host_;
scoped_refptr<AudioInputRendererHost> audio_input_renderer_host_;
@@ -174,9 +174,9 @@
AudioUtilInterface* audio_util_callback_; // Weak reference.
// Initialized on the main test thread that we mark as the UI thread.
- scoped_ptr<content::TestBrowserThread> ui_thread_;
+ scoped_ptr<TestBrowserThread> ui_thread_;
// Initialized on our IO thread to satisfy BrowserThread::IO checks.
- scoped_ptr<content::TestBrowserThread> io_thread_;
+ scoped_ptr<TestBrowserThread> io_thread_;
#if defined(OS_WIN)
// COM initialization on the IO thread.
« no previous file with comments | « content/test/test_web_contents_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698