Reland 8688002: PPB_TCPSocket_Private/PPB_UDPSocket_Private are exposed to Browser

content/renderer/render_view_impl.h

Index: content/renderer/render_view_impl.h
diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h
index 0c1d8cad62fc42a279efc8c45bec9ccf2224632a..cb8ac8f2d42edca58a9ecd516baf86c5d7c93489 100644
--- a/content/renderer/render_view_impl.h
+++ b/content/renderer/render_view_impl.h
@@ -1113,20 +1113,6 @@ class RenderViewImpl : public RenderWidget,
   std::set<gfx::PluginWindowHandle> fake_plugin_window_handles_;
 #endif
 
-  // Plugins -------------------------------------------------------------------
-
-  PepperPluginDelegateImpl pepper_delegate_;
-
-  // All the currently active plugin delegates for this RenderView; kept so
-  // that we can enumerate them to send updates about things like window
-  // location or tab focus and visibily. These are non-owning references.
-  std::set<WebPluginDelegateProxy*> plugin_delegates_;
-
-#if defined(OS_WIN)
-  // The ID of the focused NPAPI plug-in.
-  int focused_plugin_id_;
-#endif
-
   // Helper objects ------------------------------------------------------------
 
   RendererWebCookieJarImpl cookie_jar_;
@@ -1221,6 +1207,22 @@ class RenderViewImpl : public RenderWidget,
   // of handling a ViewMsg_SelectRange IPC.
   bool handling_select_range_;
 
+  // Plugins -------------------------------------------------------------------
+
+  // All the currently active plugin delegates for this RenderView; kept so
+  // that we can enumerate them to send updates about things like window
+  // location or tab focus and visibily. These are non-owning references.
+  std::set<WebPluginDelegateProxy*> plugin_delegates_;
+
+#if defined(OS_WIN)
+  // The ID of the focused NPAPI plug-in.
+  int focused_plugin_id_;
+#endif
+
+  // NOTE: pepper_delegate_ should be last member because its constructor calls
+  // AddObservers method of RenderViewImpl from c-tor.
+  PepperPluginDelegateImpl pepper_delegate_;
+
   // ---------------------------------------------------------------------------
   // ADDING NEW DATA? Please see if it fits appropriately in one of the above
   // sections rather than throwing it randomly at the end. If you're adding a