Revert 86575 - Revert 86573 - Add separate nonce version of connect calls to ChromotingScriptable...

remoting/client/plugin/chromoting_scriptable_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.
 
 // This implements the JavaScript class entrypoint for the plugin instance.
 // The Javascript API is defined as follows.
 //
 // interface ChromotingScriptableObject {
 //
 //   // Dimension of the desktop area.
@@ skipping 56 matching lines @@
 //   // User of this object should respond with calling submitLoginInfo() when
 //   // username and password is available.
 //   //
 //   // This function will be called multiple times until login was successful
 //   // or the maximum number of login attempts has been reached. In the
 //   // later case |connection_status| is changed to STATUS_FAILED.
 //   attribute Function loginChallenge;
 //
 //   // Methods for establishing a Chromoting connection.
 //   //
-//   // Either use connect() or connectSandboxed(), not both. If using
-//   // connectSandboxed(), sendIq must be set, and responses to calls on
-//   // sendIq must be piped back into onIq().
-//   void connect(string username, string host_jid, string auth_token,
-//                string nonce);
-//   void connectSandboxed(string your_jid, string host_jid, string nonce);
+//   // When using the sandboxed versions, sendIq must be set and responses to
+//   // calls on sendIq must be piped back into onIq().
+//   void connect(string host_jid, string client_jid,
+//                optional string access_code);
+//   // Non-sandboxed version used for debugging/testing.
+//   // TODO(garykac): Remove this version once we no longer need it.
+//   void connectUnsandboxed(string host_jid, string username,
+//                           string xmpp_token, optional string access_code);
+//
+//   // Terminating a Chromoting connection.
 //   void disconnect();
 //
 //   // Method for submitting login information.
 //   void submitLoginInfo(string username, string password);
 //
 //   // Method for setting scale-to-fit.
 //   void setScaleToFit(bool scale_to_fit);
 // }
 
 #ifndef REMOTING_CLIENT_PLUGIN_CHROMOTING_SCRIPTABLE_OBJECT_H_
@@ skipping 93 matching lines @@
   void AddMethod(const std::string& name, MethodHandler handler);
 
   // This should be called to signal the JS code that the connection status has
   // changed.
   void SignalConnectionInfoChange();
 
   // Signal the JS code that the desktop size has changed.
   void SignalDesktopSizeChange();
 
   pp::Var DoConnect(const std::vector<pp::Var>& args, pp::Var* exception);
-  pp::Var DoConnectSandboxed(const std::vector<pp::Var>& args,
-                             pp::Var* exception);
+  pp::Var DoConnectUnsandboxed(const std::vector<pp::Var>& args,
+                               pp::Var* exception);
   pp::Var DoDisconnect(const std::vector<pp::Var>& args, pp::Var* exception);
 
   // This method is called by JS to provide login information.
   pp::Var DoSubmitLogin(const std::vector<pp::Var>& args, pp::Var* exception);
 
   // This method is called by JS to set scale-to-fit.
   pp::Var DoSetScaleToFit(const std::vector<pp::Var>& args, pp::Var* exception);
 
   // This method is caleld by Javascript to provide responses to sendIq()
   // requests when establishing a sandboxed Chromoting connection.
   pp::Var DoOnIq(const std::vector<pp::Var>& args, pp::Var* exception);
 
   PropertyNameMap property_names_;
   std::vector<PropertyDescriptor> properties_;
   scoped_refptr<PepperXmppProxy> xmpp_proxy_;
 
   ChromotingInstance* instance_;
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_CHROMOTING_SCRIPTABLE_OBJECT_H_