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/test/render_thread_impl_browser_test_ipc_helper.h

Issue 954643002: Update mojo sdk to rev 3d23dae011859a2aae49f1d1adde705c8e85d819 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: use run_renderer_in_process() Created 5 years, 9 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
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_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_ 5 #ifndef CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_
6 #define CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_ 6 #define CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_
7 7
8 #include "content/app/mojo/mojo_init.h" 8 #include "content/app/mojo/mojo_init.h"
9 #include "content/browser/mojo/mojo_application_host.h" 9 #include "content/browser/mojo/mojo_application_host.h"
10 #include "content/common/mojo/mojo_messages.h" 10 #include "content/common/mojo/mojo_messages.h"
11 #include "ipc/ipc_channel_proxy.h" 11 #include "ipc/ipc_channel_proxy.h"
12 #include "ipc/mojo/ipc_channel_mojo.h" 12 #include "ipc/mojo/ipc_channel_mojo.h"
13 #include "ipc/mojo/scoped_ipc_support.h"
13 14
14 namespace IPC { 15 namespace IPC {
15 class ChannelMojoHost; 16 class ChannelMojoHost;
16 class ChannelProxy; 17 class ChannelProxy;
17 class Sender; 18 class Sender;
18 }; 19 };
19 20
20 namespace content { 21 namespace content {
21 22
22 // Helper for RenderThreadImplBrowserTest which takes care of setting up an IPC 23 // Helper for RenderThreadImplBrowserTest which takes care of setting up an IPC
(...skipping 12 matching lines...) Expand all
35 private: 36 private:
36 class DummyListener; 37 class DummyListener;
37 38
38 void SetupIpcThread(); 39 void SetupIpcThread();
39 void SetupMojo(); 40 void SetupMojo();
40 41
41 scoped_ptr<IPC::ChannelProxy> channel_; 42 scoped_ptr<IPC::ChannelProxy> channel_;
42 scoped_ptr<base::Thread> ipc_thread_; 43 scoped_ptr<base::Thread> ipc_thread_;
43 scoped_ptr<base::MessageLoopForIO> message_loop_; 44 scoped_ptr<base::MessageLoopForIO> message_loop_;
44 scoped_ptr<DummyListener> dummy_listener_; 45 scoped_ptr<DummyListener> dummy_listener_;
46 scoped_ptr<IPC::ScopedIPCSupport> ipc_support_;
45 scoped_ptr<MojoApplicationHost> mojo_application_host_; 47 scoped_ptr<MojoApplicationHost> mojo_application_host_;
46 scoped_ptr<IPC::ChannelMojoHost> mojo_host_; 48 scoped_ptr<IPC::ChannelMojoHost> mojo_host_;
47 std::string channel_id_; 49 std::string channel_id_;
48 }; 50 };
49 51
50 } // namespace content 52 } // namespace content
51 53
52 #endif // CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_ 54 #endif // CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_
OLDNEW
« no previous file with comments | « content/test/data/web_ui_mojo.js ('k') | content/test/render_thread_impl_browser_test_ipc_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698