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

Side by Side Diff: ppapi/proxy/ppapi_proxy_test.h

Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another nits pass. Created 5 years, 6 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 (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 <map> 5 #include <map>
6 #include <string> 6 #include <string>
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/memory/ref_counted.h" 9 #include "base/memory/ref_counted.h"
10 #include "base/memory/scoped_ptr.h" 10 #include "base/memory/scoped_ptr.h"
(...skipping 121 matching lines...) Expand 10 before | Expand all | Expand 10 after
132 browser_sender_ = browser_sender; 132 browser_sender_ = browser_sender;
133 } 133 }
134 134
135 // ProxyChannel::Delegate implementation. 135 // ProxyChannel::Delegate implementation.
136 base::SingleThreadTaskRunner* GetIPCTaskRunner() override; 136 base::SingleThreadTaskRunner* GetIPCTaskRunner() override;
137 base::WaitableEvent* GetShutdownEvent() override; 137 base::WaitableEvent* GetShutdownEvent() override;
138 IPC::PlatformFileForTransit ShareHandleWithRemote( 138 IPC::PlatformFileForTransit ShareHandleWithRemote(
139 base::PlatformFile handle, 139 base::PlatformFile handle,
140 base::ProcessId remote_pid, 140 base::ProcessId remote_pid,
141 bool should_close_source) override; 141 bool should_close_source) override;
142 base::SharedMemoryHandle ShareSharedMemoryHandleWithRemote(
143 const base::SharedMemoryHandle& handle,
144 base::ProcessId remote_pid) override;
142 145
143 // PluginDispatcher::PluginDelegate implementation. 146 // PluginDispatcher::PluginDelegate implementation.
144 std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override; 147 std::set<PP_Instance>* GetGloballySeenInstanceIDSet() override;
145 uint32 Register(PluginDispatcher* plugin_dispatcher) override; 148 uint32 Register(PluginDispatcher* plugin_dispatcher) override;
146 void Unregister(uint32 plugin_dispatcher_id) override; 149 void Unregister(uint32 plugin_dispatcher_id) override;
147 150
148 // PluginProxyDelegate implementation. 151 // PluginProxyDelegate implementation.
149 IPC::Sender* GetBrowserSender() override; 152 IPC::Sender* GetBrowserSender() override;
150 std::string GetUILanguage() override; 153 std::string GetUILanguage() override;
151 void PreCacheFont(const void* logfontw) override; 154 void PreCacheFont(const void* logfontw) override;
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
272 shutdown_event_ = shutdown_event; 275 shutdown_event_ = shutdown_event;
273 } 276 }
274 277
275 // ProxyChannel::Delegate implementation. 278 // ProxyChannel::Delegate implementation.
276 base::MessageLoopProxy* GetIPCTaskRunner() override; 279 base::MessageLoopProxy* GetIPCTaskRunner() override;
277 base::WaitableEvent* GetShutdownEvent() override; 280 base::WaitableEvent* GetShutdownEvent() override;
278 IPC::PlatformFileForTransit ShareHandleWithRemote( 281 IPC::PlatformFileForTransit ShareHandleWithRemote(
279 base::PlatformFile handle, 282 base::PlatformFile handle,
280 base::ProcessId remote_pid, 283 base::ProcessId remote_pid,
281 bool should_close_source) override; 284 bool should_close_source) override;
285 base::SharedMemoryHandle ShareSharedMemoryHandleWithRemote(
286 const base::SharedMemoryHandle& handle,
287 base::ProcessId remote_pid) override;
282 288
283 private: 289 private:
284 base::MessageLoopProxy* ipc_message_loop_; // Weak 290 base::MessageLoopProxy* ipc_message_loop_; // Weak
285 base::WaitableEvent* shutdown_event_; // Weak 291 base::WaitableEvent* shutdown_event_; // Weak
286 292
287 DISALLOW_COPY_AND_ASSIGN(DelegateMock); 293 DISALLOW_COPY_AND_ASSIGN(DelegateMock);
288 }; 294 };
289 295
290 private: 296 private:
291 void CreateHostGlobals(); 297 void CreateHostGlobals();
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
365 // EXPECT_VAR_IS_STRING("foo", my_var); 371 // EXPECT_VAR_IS_STRING("foo", my_var);
366 #define EXPECT_VAR_IS_STRING(str, var) { \ 372 #define EXPECT_VAR_IS_STRING(str, var) { \
367 StringVar* sv = StringVar::FromPPVar(var); \ 373 StringVar* sv = StringVar::FromPPVar(var); \
368 EXPECT_TRUE(sv); \ 374 EXPECT_TRUE(sv); \
369 if (sv) \ 375 if (sv) \
370 EXPECT_EQ(str, sv->value()); \ 376 EXPECT_EQ(str, sv->value()); \
371 } 377 }
372 378
373 } // namespace proxy 379 } // namespace proxy
374 } // namespace ppapi 380 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698