Implement DaemonController::GetVersion() method on Linux

remoting/host/plugin/daemon_controller_linux.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.
 
 #include "remoting/host/plugin/daemon_controller.h"
 
 #include <unistd.h>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
@@ skipping 58 matching lines @@
 
  private:
   FilePath GetConfigPath();
 
   void DoGetConfig(const GetConfigCallback& callback);
   void DoSetConfigAndStart(scoped_ptr<base::DictionaryValue> config,
                            const CompletionCallback& done);
   void DoUpdateConfig(scoped_ptr<base::DictionaryValue> config,
                       const CompletionCallback& done_callback);
   void DoStop(const CompletionCallback& done_callback);
+  void DoGetVersion(const GetVersionCallback& done_callback);
 
   base::Thread file_io_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(DaemonControllerLinux);
 };
 
 DaemonControllerLinux::DaemonControllerLinux()
     : file_io_thread_("DaemonControllerFileIO") {
   file_io_thread_.Start();
 }
@@ skipping 98 matching lines @@
       &DaemonControllerLinux::DoStop, base::Unretained(this),
       done_callback));
 }
 
 void DaemonControllerLinux::SetWindow(void* window_handle) {
   // noop
 }
 
 void DaemonControllerLinux::GetVersion(
     const GetVersionCallback& done_callback) {
-  // TODO(sergeyu): Implement this method.
-  NOTIMPLEMENTED();
-  done_callback.Run("");
+  file_io_thread_.message_loop()->PostTask(FROM_HERE, base::Bind(
+      &DaemonControllerLinux::DoGetVersion, base::Unretained(this),
+      done_callback));
 }
 
 FilePath DaemonControllerLinux::GetConfigPath() {
   std::string filename = "host#" + GetMd5(net::GetHostName()) + ".json";
   return file_util::GetHomeDir().
       Append(".config/chrome-remote-desktop").Append(filename);
 }
 
 void DaemonControllerLinux::DoGetConfig(const GetConfigCallback& callback) {
   scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
@@ skipping 85 matching lines @@
   int exit_code = 0;
   AsyncResult result;
   if (RunHostScript(args, &exit_code)) {
     result = (exit_code == 0) ? RESULT_OK : RESULT_FAILED;
   } else {
     result = RESULT_FAILED;
   }
   done_callback.Run(result);
 }
 
+void DaemonControllerLinux::DoGetVersion(
+    const GetVersionCallback& done_callback) {
+  FilePath script_path;
+  if (!GetScriptPath(&script_path)) {
+    done_callback.Run("");
+    return;
+  }
+  CommandLine command_line(script_path);
+  command_line.AppendArg("--host-version");
+
+  std::string output;

[Jamie, 2012/09/06 01:29:50]

TrimWhitespaceASCII states that it's safe to use the same string for input and
output, so perhaps just call this |version| and use it for both?

[Sergey Ulanov, 2012/09/06 19:31:58]

Done.

+  int exit_code;
+  int result =
+      base::GetAppOutputWithExitCode(command_line, &output, &exit_code);
+  if (!result) {

[Jamie, 2012/09/06 01:29:50]

LOG(ERROR) here?

[Sergey Ulanov, 2012/09/06 19:31:58]

Done.

+    done_callback.Run("");
+    return;
+  }
+

[Jamie, 2012/09/06 01:29:50]

Perhaps add a test for exit_code being zero?

[Sergey Ulanov, 2012/09/06 19:31:58]

Done.

+  std::string version;
+  TrimWhitespaceASCII(output, TRIM_ALL, &version);
+  if (!ContainsOnlyChars(version, "0123456789.")) {
+    LOG(ERROR) << "Received invalid host version number: " << version;
+    done_callback.Run("");
+    return;
+  }
+
+  done_callback.Run(version);
+}
+
 }  // namespace
 
 scoped_ptr<DaemonController> remoting::DaemonController::Create() {
   return scoped_ptr<DaemonController>(new DaemonControllerLinux());
 }
 
 }  // namespace remoting