Rename PepperSignalStrategy to DelegateSignalStrategy.

Because it has nothing to do with Pepper.

BUG=274652

Review URL: https://chromiumcodereview.appspot.com/23367003

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

5 files changed, 32 insertions, 32 deletions

diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc
index 3469ca2..2f7d481 100644
--- a/remoting/client/plugin/chromoting_instance.cc
+++ b/remoting/client/plugin/chromoting_instance.cc
@@ -31,10 +31,10 @@
 #include "remoting/client/chromoting_client.h"
 #include "remoting/client/client_config.h"
 #include "remoting/client/frame_consumer_proxy.h"
+#include "remoting/client/plugin/delegating_signal_strategy.h"
 #include "remoting/client/plugin/pepper_audio_player.h"
 #include "remoting/client/plugin/pepper_input_handler.h"
 #include "remoting/client/plugin/pepper_port_allocator.h"
-#include "remoting/client/plugin/pepper_signal_strategy.h"
 #include "remoting/client/plugin/pepper_token_fetcher.h"
 #include "remoting/client/plugin/pepper_view.h"
 #include "remoting/client/rectangle_update_decoder.h"
@@ -707,8 +707,8 @@ void ChromotingInstance::Connect(const ClientConfig& config) {
   LOG(INFO) << "Connecting to " << config.host_jid
             << ". Local jid: " << config.local_jid << ".";
 
-  // Setup the PepperSignalStrategy.
-  signal_strategy_.reset(new PepperSignalStrategy(
+  // Setup the signal strategy.
+  signal_strategy_.reset(new DelegatingSignalStrategy(
       config.local_jid,
       base::Bind(&ChromotingInstance::SendOutgoingIq,
                  weak_factory_.GetWeakPtr())));
diff --git a/remoting/client/plugin/chromoting_instance.h b/remoting/client/plugin/chromoting_instance.h
index 4c786e1..f4eb7af 100644
--- a/remoting/client/plugin/chromoting_instance.h
+++ b/remoting/client/plugin/chromoting_instance.h
@@ -58,11 +58,11 @@ namespace remoting {
 class ChromotingClient;
 class ChromotingStats;
 class ClientContext;
+class DelegatingSignalStrategy;
 class FrameConsumerProxy;
 class PepperAudioPlayer;
 class PepperTokenFetcher;
 class PepperView;
-class PepperSignalStrategy;
 class RectangleUpdateDecoder;
 
 struct ClientConfig;
@@ -209,7 +209,7 @@ class ChromotingInstance :
   // Posts trapped keys to the web-app to handle.
   void SendTrappedKey(uint32 usb_keycode, bool pressed);
 
-  // Callback for PepperSignalStrategy.
+  // Callback for DelegatingSignalStrategy.
   void SendOutgoingIq(const std::string& iq);
 
   void SendPerfStats();
@@ -240,7 +240,7 @@ class ChromotingInstance :
   // Contains the most-recently-reported desktop shape, if any.
   scoped_ptr<SkRegion> desktop_shape_;
 
-  scoped_ptr<PepperSignalStrategy> signal_strategy_;
+  scoped_ptr<DelegatingSignalStrategy> signal_strategy_;
 
   scoped_ptr<protocol::ConnectionToHost> host_connection_;
   scoped_ptr<ChromotingClient> client_;
diff --git a/remoting/client/plugin/pepper_signal_strategy.cc b/remoting/client/plugin/delegating_signal_strategy.cc
index 3e8f675..7129341 100644
--- a/remoting/client/plugin/pepper_signal_strategy.cc
+++ b/remoting/client/plugin/delegating_signal_strategy.cc
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "remoting/client/plugin/pepper_signal_strategy.h"
+#include "remoting/client/plugin/delegating_signal_strategy.h"
 
 #include "base/strings/string_number_conversions.h"
 #include "third_party/libjingle/source/talk/xmllite/xmlelement.h"
 
 namespace remoting {
 
-PepperSignalStrategy::PepperSignalStrategy(
+DelegatingSignalStrategy::DelegatingSignalStrategy(
     std::string local_jid,
     const SendIqCallback& send_iq_callback)
     : local_jid_(local_jid),
@@ -17,10 +17,10 @@ PepperSignalStrategy::PepperSignalStrategy(
       last_id_(0) {
 }
 
-PepperSignalStrategy::~PepperSignalStrategy() {
+DelegatingSignalStrategy::~DelegatingSignalStrategy() {
 }
 
-void PepperSignalStrategy::OnIncomingMessage(const std::string& message) {
+void DelegatingSignalStrategy::OnIncomingMessage(const std::string& message) {
  scoped_ptr<buzz::XmlElement> stanza(buzz::XmlElement::ForStr(message));
   if (!stanza.get()) {
     LOG(WARNING) << "Malformed XMPP stanza received: " << message;
@@ -35,38 +35,38 @@ void PepperSignalStrategy::OnIncomingMessage(const std::string& message) {
   }
 }
 
-void PepperSignalStrategy::Connect() {
+void DelegatingSignalStrategy::Connect() {
 }
 
-void PepperSignalStrategy::Disconnect() {
+void DelegatingSignalStrategy::Disconnect() {
 }
 
-SignalStrategy::State PepperSignalStrategy::GetState() const {
+SignalStrategy::State DelegatingSignalStrategy::GetState() const {
   return CONNECTED;
 }
 
-SignalStrategy::Error PepperSignalStrategy::GetError() const {
+SignalStrategy::Error DelegatingSignalStrategy::GetError() const {
   return OK;
 }
 
-std::string PepperSignalStrategy::GetLocalJid() const {
+std::string DelegatingSignalStrategy::GetLocalJid() const {
   return local_jid_;
 }
 
-void PepperSignalStrategy::AddListener(Listener* listener) {
+void DelegatingSignalStrategy::AddListener(Listener* listener) {
   listeners_.AddObserver(listener);
 }
 
-void PepperSignalStrategy::RemoveListener(Listener* listener) {
+void DelegatingSignalStrategy::RemoveListener(Listener* listener) {
   listeners_.RemoveObserver(listener);
 }
 
-bool PepperSignalStrategy::SendStanza(scoped_ptr<buzz::XmlElement> stanza) {
+bool DelegatingSignalStrategy::SendStanza(scoped_ptr<buzz::XmlElement> stanza) {
   send_iq_callback_.Run(stanza->Str());
   return true;
 }
 
-std::string PepperSignalStrategy::GetNextId() {
+std::string DelegatingSignalStrategy::GetNextId() {
   ++last_id_;
   return base::IntToString(last_id_);
 }
diff --git a/remoting/client/plugin/pepper_signal_strategy.h b/remoting/client/plugin/delegating_signal_strategy.h
index f5fab46..f22539a 100644
--- a/remoting/client/plugin/pepper_signal_strategy.h
+++ b/remoting/client/plugin/delegating_signal_strategy.h
@@ -1,9 +1,9 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2013 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 REMOTING_CLIENT_PLUGIN_PEPPER_XMPP_PROXY_H_
-#define REMOTING_CLIENT_PLUGIN_PEPPER_XMPP_PROXY_H_
+#ifndef REMOTING_CLIENT_PLUGIN_DELEGATING_SIGNAL_STRATEGY_H_
+#define REMOTING_CLIENT_PLUGIN_DELEGATING_SIGNAL_STRATEGY_H_
 
 #include "base/callback.h"
 #include "base/observer_list.h"
@@ -15,13 +15,13 @@ class SingleThreadTaskRunner;
 
 namespace remoting {
 
-class PepperSignalStrategy : public SignalStrategy {
+class DelegatingSignalStrategy : public SignalStrategy {
  public:
   typedef base::Callback<void(const std::string&)> SendIqCallback;
 
-  PepperSignalStrategy(std::string local_jid,
+  DelegatingSignalStrategy(std::string local_jid,
                        const SendIqCallback& send_iq_callback);
-  virtual ~PepperSignalStrategy();
+  virtual ~DelegatingSignalStrategy();
 
   void OnIncomingMessage(const std::string& message);
 
@@ -44,9 +44,9 @@ class PepperSignalStrategy : public SignalStrategy {
 
   int last_id_;
 
-  DISALLOW_COPY_AND_ASSIGN(PepperSignalStrategy);
+  DISALLOW_COPY_AND_ASSIGN(DelegatingSignalStrategy);
 };
 
 }  // namespace remoting
 
-#endif  // REMOTING_CLIENT_PLUGIN_PEPPER_XMPP_PROXY_H_
+#endif  // REMOTING_CLIENT_PLUGIN_DELEGATING_SIGNAL_STRATEGY_H_
diff --git a/remoting/remoting.gyp b/remoting/remoting.gyp
index 6ddb8eb..794c803 100644
--- a/remoting/remoting.gyp
+++ b/remoting/remoting.gyp
@@ -2051,9 +2051,11 @@
         'client/plugin/chromoting_instance.cc',
         'client/plugin/chromoting_instance.h',
         'client/plugin/normalizing_input_filter.cc',
+        'client/plugin/delegating_signal_strategy.cc',
+        'client/plugin/delegating_signal_strategy.h',
+        'client/plugin/normalizing_input_filter.h',
         'client/plugin/normalizing_input_filter_cros.cc',
         'client/plugin/normalizing_input_filter_mac.cc',
-        'client/plugin/normalizing_input_filter.h',
         'client/plugin/pepper_audio_player.cc',
         'client/plugin/pepper_audio_player.h',
         'client/plugin/pepper_entrypoints.cc',
@@ -2070,12 +2072,10 @@
         'client/plugin/pepper_port_allocator.h',
         'client/plugin/pepper_token_fetcher.cc',
         'client/plugin/pepper_token_fetcher.h',
-        'client/plugin/pepper_view.cc',
-        'client/plugin/pepper_view.h',
         'client/plugin/pepper_util.cc',
         'client/plugin/pepper_util.h',
-        'client/plugin/pepper_signal_strategy.cc',
-        'client/plugin/pepper_signal_strategy.h',
+        'client/plugin/pepper_view.cc',
+        'client/plugin/pepper_view.h',
       ],
       'conditions' : [
         [ '(OS!="linux" or chromeos==0)', {