Move plugin/srpc contents to the more appropriately named plugin/common....

src/trusted/plugin/scriptable_handle.cc

 /*
  * Copyright 2008 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can
  * be found in the LICENSE file.
  */
 
 
 // NPAPI Scriptable handle implementation.
 
-#include "native_client/src/trusted/plugin/srpc/scriptable_handle.h"
+#include "native_client/src/trusted/plugin/scriptable_handle.h"
 
 #include <stdio.h>
 #include <string.h>
 
 #include <set>
 
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/include/portability.h"
-#include "native_client/src/trusted/plugin/srpc/browser_interface.h"
-#include "native_client/src/trusted/plugin/srpc/socket_address.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
+#include "native_client/src/trusted/plugin/browser_interface.h"
+#include "native_client/src/trusted/plugin/socket_address.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 
 namespace {
 
 // For security we keep track of the set of scriptable handles that were
 // created.
 
 std::set<const plugin::ScriptableHandle*>* g_ValidHandles = 0;
 
 }  // namespace
@@ skipping 43 matching lines @@
   }
   size_t count =
       g_ValidHandles->count(static_cast<const ScriptableHandle*>(handle));
   PLUGIN_PRINTF(("ScriptableHandle::is_valid(%p, count %"NACL_PRIuS")\n",
                  static_cast<void*>(const_cast<ScriptableHandle*>(handle)),
                  count));
   return 0 != count;
 }
 
 }  // namespace plugin