The Chromoting service should not start automatically unless it was configured from the webapp to d…

remoting/host/remoting_me2me_host.cc

 // Copyright (c) 2012 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 file implements a standalone host process for Me2Me, which is currently
 // used for the Linux-only Virtual Me2Me build.
 
 #if defined(OS_WIN)
 #include <windows.h>
 #endif
@@ skipping 30 matching lines @@
 #include "remoting/host/signaling_connector.h"
 #include "remoting/jingle_glue/xmpp_signal_strategy.h"
 #include "remoting/protocol/me2me_host_authenticator_factory.h"
 
 #if defined(TOOLKIT_GTK)
 #include "ui/gfx/gtk_util.h"
 #endif
 
 namespace {
 
+// The process exit codes.

[Wez, 2012/04/10 21:26:20]

nit: This comment doesn't really add anything.

[alexeypa (please no reviews), 2012/04/10 22:18:16]

Done.

+const int kSuccessExitCode = 0;
+const int kInvalidHostConfigurationExitCode = 1;
+
 // This is used for tagging system event logs.
 const char kApplicationName[] = "chromoting";
 
 // These are used for parsing the config-file locations from the command line,
 // and for defining the default locations if the switches are not present.
 const char kAuthConfigSwitchName[] = "auth-config";
 const char kHostConfigSwitchName[] = "host-config";
 
 const FilePath::CharType kDefaultAuthConfigFile[] =
     FILE_PATH_LITERAL("auth.json");
@@ skipping 39 matching lines @@
     }
 
 #if defined(OS_LINUX)
     Capturer::EnableXDamage(true);
 #endif
   }
 
   int Run() {
     bool tokens_pending = false;
     if (!LoadConfig(file_io_thread_.message_loop_proxy(), &tokens_pending)) {
-      return 1;
+      return kInvalidHostConfigurationExitCode;
     }
     if (tokens_pending) {
       // If we have an OAuth refresh token, then XmppSignalStrategy can't
       // handle it directly, so refresh it asynchronously. A task will be
       // posted on the message loop to start watching the NAT policy when
       // the access token is available.
       oauth_client_.Start(oauth_refresh_token_, this,
                           message_loop_.message_loop_proxy());
     } else {
       StartWatchingNatPolicy();
     }
 
     message_loop_.Run();
 
-    return 0;
+    return kSuccessExitCode;
   }
 
   // Overridden from OAuthClient::Delegate
   virtual void OnRefreshTokenResponse(const std::string& access_token,
                                       int expires) OVERRIDE {
     xmpp_auth_token_ = access_token;
     // If there's already a signal strategy object, update it ready for the
     // next time it calls Connect. If not, then this is the initial token
     // exchange, so proceed to the next stage of connection.
     if (signal_strategy_.get()) {
@@ skipping 240 matching lines @@
 int CALLBACK WinMain(HINSTANCE instance,
                      HINSTANCE previous_instance,
                      LPSTR command_line,
                      int show_command) {
   // CommandLine::Init() ignores the passed |argc| and |argv| on Windows getting
   // the command line from GetCommandLineW(), so we can safely pass NULL here.
   return main(0, NULL);
 }
 
 #endif