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

src/trusted/plugin/npapi/npapi_native.h

 /*
  * 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.
  */
 
 
 #ifndef NATIVE_CLIENT_NPAPI_PLUGIN_NPAPI_NPAPI_NATIVE_H_
 #define NATIVE_CLIENT_NPAPI_PLUGIN_NPAPI_NPAPI_NATIVE_H_
 
 #include "native_client/src/include/checked_cast.h"
 #include "native_client/src/shared/srpc/nacl_srpc.h"
 #include "native_client/src/trusted/desc/nacl_desc_base.h"
 #include "native_client/src/trusted/plugin/npapi/plugin_npapi.h"
 #include "native_client/src/trusted/plugin/npapi/ret_array.h"
-#include "native_client/src/trusted/plugin/srpc/utility.h"
+#include "native_client/src/trusted/plugin/utility.h"
 
 #ifndef SIZE_T_MAX
 # define SIZE_T_MAX (~((size_t) 0))
 #endif  // SIZE_T_MAX
 
 namespace plugin {
 
 // A utility method that gets the length value from an array NPVariant.
 // It returns true if the NPVariant is an array, false otherwise.
 extern bool NPVariantObjectLength(const NPVariant* variant,
@@ skipping 165 matching lines @@
   }
   // Make the element count and data available to the caller.
   *array_length = nacl::assert_cast<uint32_t>(element_count);
   *array_data = tmp_array_data;
   return true;
 }
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_NPAPI_PLUGIN_NPAPI_NPAPI_NATIVE_H_