Revert 223482 "Simplify PPB_NetworkMonitor proxy."

trunk/src/ppapi/proxy/serialized_structs.h

 // Copyright (c) 2012 The Chromium 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 PPAPI_PROXY_SERIALIZED_STRUCTS_H_
 #define PPAPI_PROXY_SERIALIZED_STRUCTS_H_
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
 #include "build/build_config.h"
 #include "ppapi/c/dev/ppb_truetype_font_dev.h"
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_point.h"
 #include "ppapi/c/pp_rect.h"
-#include "ppapi/c/private/ppb_net_address_private.h"
-#include "ppapi/c/private/ppb_network_list_private.h"
 #include "ppapi/proxy/ppapi_proxy_export.h"
 #include "ppapi/shared_impl/host_resource.h"
 
 class Pickle;
 struct PP_FontDescription_Dev;
 struct PP_BrowserFont_Trusted_Description;
 
 namespace ppapi {
 namespace proxy {
 
@@ skipping 21 matching lines @@
   std::string face;
   int32_t family;
   uint32_t size;
   int32_t weight;
   PP_Bool italic;
   PP_Bool small_caps;
   int32_t letter_spacing;
   int32_t word_spacing;
 };
 
-struct PPAPI_PROXY_EXPORT SerializedNetworkInfo {
-  SerializedNetworkInfo();
-  ~SerializedNetworkInfo();
-
-  std::string name;
-  PP_NetworkListType_Private type;
-  PP_NetworkListState_Private state;
-  std::vector<PP_NetAddress_Private> addresses;
-  std::string display_name;
-  int mtu;
-};
-typedef std::vector<SerializedNetworkInfo> SerializedNetworkList;
-
 struct PPAPI_PROXY_EXPORT SerializedTrueTypeFontDesc {
   SerializedTrueTypeFontDesc();
   ~SerializedTrueTypeFontDesc();
 
   // Sets this to correspond to the contents of a PP_TrueTypeFontDesc_Dev.
   //
   // The reference count of the desc.family PP_Var will be unchanged and the
   // caller is responsible for releasing it.
   void SetFromPPTrueTypeFontDesc(const PP_TrueTypeFontDesc_Dev& desc);
 
@@ skipping 54 matching lines @@
 // On legacy X Windows this is a SysV shared memory key.
 typedef int ImageHandle;
 #else
 typedef base::SharedMemoryHandle ImageHandle;
 #endif
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_SERIALIZED_STRUCTS_H_