Move signaling connection creation out of ChromotingHost.

remoting/host/plugin/host_script_object.h

 // Copyright (c) 2011 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_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 #define REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 50 matching lines @@
               const NPVariant* args,
               uint32_t argCount,
               NPVariant* result);
   bool HasProperty(const std::string& property_name);
   bool GetProperty(const std::string& property_name, NPVariant* result);
   bool SetProperty(const std::string& property_name, const NPVariant* value);
   bool RemoveProperty(const std::string& property_name);
   bool Enumerate(std::vector<std::string>* values);
 
   // remoting::HostStatusObserver implementation.
-  virtual void OnSignallingConnected(
-      remoting::SignalStrategy* signal_strategy) OVERRIDE;
-  virtual void OnSignallingDisconnected() OVERRIDE;
   virtual void OnAccessDenied() OVERRIDE;
   virtual void OnClientAuthenticated(const std::string& jid) OVERRIDE;
   virtual void OnClientDisconnected(const std::string& jid) OVERRIDE;
   virtual void OnShutdown() OVERRIDE;
 
   // Post LogDebugInfo to the correct proxy (and thus, on the correct thread).
   // This should only be called by HostLogHandler. To log to the UI, use the
   // standard LOG(INFO) and it will be sent to this method.
   void PostLogDebugInfo(const std::string& message);
 
@@ skipping 86 matching lines @@
   std::string access_code_;
   base::TimeDelta access_code_lifetime_;
 
   std::string client_username_;
   ScopedRefNPObject log_debug_info_func_;
   ScopedRefNPObject on_nat_traversal_policy_changed_func_;
   ScopedRefNPObject on_state_changed_func_;
   base::PlatformThreadId np_thread_id_;
   scoped_refptr<PluginMessageLoopProxy> plugin_message_loop_proxy_;
 
+  ChromotingHostContext host_context_;
+  scoped_refptr<MutableHostConfig> host_config_;
+  scoped_ptr<SignalStrategy> signal_strategy_;
   scoped_ptr<RegisterSupportHostRequest> register_request_;
   scoped_ptr<LogToServer> log_to_server_;
-  scoped_refptr<MutableHostConfig> host_config_;
-  ChromotingHostContext host_context_;
   scoped_ptr<DesktopEnvironment> desktop_environment_;
   scoped_ptr<It2MeHostUserInterface> it2me_host_user_interface_;
 
   scoped_refptr<ChromotingHost> host_;
   int failed_login_attempts_;
 
   UiStrings ui_strings_;
   base::Lock ui_strings_lock_;
 
   base::WaitableEvent disconnected_event_;
@@ skipping 21 matching lines @@
   // it can be executed after at least one successful policy read. This
   // variable contains the thunk if it is necessary.
   base::Closure pending_connect_;
 };
 
 }  // namespace remoting
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(remoting::HostNPScriptObject);
 
 #endif  // REMOTING_HOST_PLUGIN_HOST_SCRIPT_OBJECT_H_