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

Side by Side Diff: content/test/render_thread_impl_browser_test_ipc_helper.h

Issue 1874903002: Convert //content from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix indent Created 4 years, 8 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/test/ppapi_unittest.h ('k') | content/test/run_all_unittests.cc » ('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 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"
(...skipping 26 matching lines...) Expand all
37 mojo::MessagePipeHandle GetMessagePipeHandle() { 37 mojo::MessagePipeHandle GetMessagePipeHandle() {
38 return message_pipe_handle_.release(); 38 return message_pipe_handle_.release();
39 } 39 }
40 40
41 private: 41 private:
42 class DummyListener; 42 class DummyListener;
43 43
44 void SetupIpcThread(); 44 void SetupIpcThread();
45 void SetupMojo(); 45 void SetupMojo();
46 46
47 scoped_ptr<IPC::ChannelProxy> channel_; 47 std::unique_ptr<IPC::ChannelProxy> channel_;
48 scoped_ptr<base::Thread> ipc_thread_; 48 std::unique_ptr<base::Thread> ipc_thread_;
49 scoped_ptr<base::MessageLoopForIO> message_loop_; 49 std::unique_ptr<base::MessageLoopForIO> message_loop_;
50 scoped_ptr<DummyListener> dummy_listener_; 50 std::unique_ptr<DummyListener> dummy_listener_;
51 scoped_ptr<IPC::ScopedIPCSupport> ipc_support_; 51 std::unique_ptr<IPC::ScopedIPCSupport> ipc_support_;
52 scoped_ptr<MojoApplicationHost> mojo_application_host_; 52 std::unique_ptr<MojoApplicationHost> mojo_application_host_;
53 mojo::ScopedMessagePipeHandle message_pipe_handle_; 53 mojo::ScopedMessagePipeHandle message_pipe_handle_;
54 std::string channel_id_; 54 std::string channel_id_;
55 }; 55 };
56 56
57 } // namespace content 57 } // namespace content
58 58
59 #endif // CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_ 59 #endif // CONTENT_TEST_RENDER_THREAD_IMPL_BROWSER_TEST_IPC_HELPER_H_
OLDNEW
« no previous file with comments | « content/test/ppapi_unittest.h ('k') | content/test/run_all_unittests.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698