Move PepperNetworkManager to client/plugin

Review URL: http://codereview.chromium.org/10103016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132533 0039d316-1c4b-4281-b951-d872f2087c98

remoting/protocol/pepper_network_manager.cc → remoting/client/plugin/pepper_network_manager.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/protocol/pepper_network_manager.h"
+#include "remoting/client/plugin/pepper_network_manager.h"
 
 #include "base/bind.h"
 #include "base/message_loop.h"
@@ -11,7 +11,6 @@
 #include "ppapi/cpp/private/net_address_private.h"
 
 namespace remoting {
-namespace protocol {
 
 PepperNetworkManager::PepperNetworkManager(const pp::InstanceHandle& instance)
     : monitor_(instance, &PepperNetworkManager::OnNetworkListCallbackHandler,
@@ -110,5 +109,4 @@ void PepperNetworkManager::SendNetworksChangedSignal() {
   SignalNetworksChanged();
 }
 
-}  // namespace protocol
 }  // namespace remoting

remoting/protocol/pepper_network_manager.h → remoting/client/plugin/pepper_network_manager.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef REMOTING_PROTOCOL_PEPPER_NETWORK_MANAGER_H_
-#define REMOTING_PROTOCOL_PEPPER_NETWORK_MANAGER_H_
+#ifndef REMOTING_CLIENT_PLUGIN_PEPPER_NETWORK_MANAGER_H_
+#define REMOTING_CLIENT_PLUGIN_PEPPER_NETWORK_MANAGER_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/weak_ptr.h"
@@ -16,7 +16,6 @@ class NetworkListPrivate;
 }  // namespace pp
 
 namespace remoting {
-namespace protocol {
 
 // PepperNetworkManager uses the PPB_NetworkMonitor_Private API to
 // implement the NetworkManager interface that libjingle uses to
@@ -45,7 +44,6 @@ class PepperNetworkManager : public talk_base::NetworkManagerBase {
   base::WeakPtrFactory<PepperNetworkManager> weak_factory_;
 };
 
-}  // namespace protocol
 }  // namespace remoting
 
-#endif  // REMOTING_PROTOCOL_PEPPER_NETWORK_MANAGER_H_
+#endif  // REMOTING_CLIENT_PLUGIN_PEPPER_NETWORK_MANAGER_H_

remoting/remoting.gyp

@@ -537,6 +537,8 @@
         'client/plugin/pepper_entrypoints.h',
         'client/plugin/pepper_input_handler.cc',
         'client/plugin/pepper_input_handler.h',
+        'client/plugin/pepper_network_manager.cc',
+        'client/plugin/pepper_network_manager.h',
         'client/plugin/pepper_plugin_thread_delegate.cc',
         'client/plugin/pepper_plugin_thread_delegate.h',
         'client/plugin/pepper_view.cc',
@@ -1292,8 +1294,6 @@
         'protocol/message_reader.h',
         'protocol/negotiating_authenticator.cc',
         'protocol/negotiating_authenticator.h',
-        'protocol/pepper_network_manager.cc',
-        'protocol/pepper_network_manager.h',
         'protocol/pepper_transport_factory.cc',
         'protocol/pepper_transport_factory.h',
         'protocol/pepper_transport_socket_adapter.cc',