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

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

Issue 7655002: Convert the pp::proxy namespace to the ppapi::proxy namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 4 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
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "ppapi/proxy/ppapi_proxy_test.h" 5 #include "ppapi/proxy/ppapi_proxy_test.h"
6 6
7 #include "base/message_loop_proxy.h" 7 #include "base/message_loop_proxy.h"
8 #include "base/observer_list.h" 8 #include "base/observer_list.h"
9 #include "ipc/ipc_sync_channel.h" 9 #include "ipc/ipc_sync_channel.h"
10 #include "ppapi/c/pp_errors.h" 10 #include "ppapi/c/pp_errors.h"
11 #include "ppapi/c/private/ppb_proxy_private.h" 11 #include "ppapi/c/private/ppb_proxy_private.h"
12 #include "ppapi/proxy/ppapi_messages.h" 12 #include "ppapi/proxy/ppapi_messages.h"
13 #include "ppapi/shared_impl/ppapi_preferences.cc" 13 #include "ppapi/shared_impl/ppapi_preferences.cc"
14 14
15 namespace pp { 15 namespace ppapi {
16 namespace proxy { 16 namespace proxy {
17 17
18 namespace { 18 namespace {
19 // HostDispatcher requires a PPB_Proxy_Private, so we always provide a fallback 19 // HostDispatcher requires a PPB_Proxy_Private, so we always provide a fallback
20 // do-nothing implementation. 20 // do-nothing implementation.
21 void PluginCrashed(PP_Module module) { 21 void PluginCrashed(PP_Module module) {
22 NOTREACHED(); 22 NOTREACHED();
23 }; 23 };
24 24
25 PP_Instance GetInstanceForResource(PP_Resource resource) { 25 PP_Instance GetInstanceForResource(PP_Resource resource) {
(...skipping 342 matching lines...) Expand 10 before | Expand all | Expand 10 after
368 &remote_harness_torn_down)); 368 &remote_harness_torn_down));
369 remote_harness_torn_down.Wait(); 369 remote_harness_torn_down.Wait();
370 370
371 local_harness_->TearDownHarness(); 371 local_harness_->TearDownHarness();
372 372
373 io_thread_.Stop(); 373 io_thread_.Stop();
374 } 374 }
375 375
376 376
377 } // namespace proxy 377 } // namespace proxy
378 } // namespace pp 378 } // namespace ppapi
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698