Replace --explicit-config option in me2me_virtual_host.py with --silent.

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 215 matching lines @@
     } else {
       result.reset(); // Return NULL in case of error.
     }
   }
 
   callback.Run(result.Pass());
 }
 
 void DaemonControllerLinux::DoSetConfigAndStart(
     scoped_ptr<base::DictionaryValue> config,
-    const CompletionCallback& done) {
+    const CompletionCallback& done_callback) {
+  JsonHostConfig config_file(GetConfigPath());
+  for (DictionaryValue::key_iterator key(config->begin_keys());
+       key != config->end_keys(); ++key) {
+    std::string value;
+    if (!config->GetString(*key, &value)) {
+      LOG(ERROR) << *key << " is not a string.";
+      done_callback.Run(RESULT_FAILED);
+      return;
+    }
+    config_file.SetString(*key, value);
+  }
+
+  bool success = config_file.Save();
+  if (!success) {
+    done_callback.Run(RESULT_FAILED);
+    return;
+  }
+
   std::vector<std::string> args;
-  args.push_back("--explicit-config");
-  std::string config_json;
-  base::JSONWriter::Write(config.get(), &config_json);
-  args.push_back(config_json);
-  std::vector<std::string> no_args;
-  int exit_code = 0;
+  args.push_back("--silent");
   AsyncResult result;
+  int exit_code;
   if (RunScript(args, &exit_code)) {
     result = (exit_code == 0) ? RESULT_OK : RESULT_FAILED;
   } else {
     result = RESULT_FAILED;
   }
-  done.Run(result);
+  done_callback.Run(result);
 }
 
 void DaemonControllerLinux::DoUpdateConfig(
     scoped_ptr<base::DictionaryValue> config,
     const CompletionCallback& done_callback) {
   JsonHostConfig config_file(GetConfigPath());
   if (!config_file.Read()) {
     done_callback.Run(RESULT_FAILED);
   }
 
   for (DictionaryValue::key_iterator key(config->begin_keys());
        key != config->end_keys(); ++key) {
     std::string value;
     if (!config->GetString(*key, &value)) {
       LOG(ERROR) << *key << " is not a string.";
       done_callback.Run(RESULT_FAILED);
+      return;
     }
     config_file.SetString(*key, value);
   }
   bool success = config_file.Save();
   done_callback.Run(success ? RESULT_OK : RESULT_FAILED);
   // TODO(sergeyu): Send signal to the daemon to restart the host.
 }
 
 void DaemonControllerLinux::DoStop(const CompletionCallback& done_callback) {
   std::vector<std::string> args;
   args.push_back("--stop");
   int exit_code = 0;
   AsyncResult result;
   if (RunScript(args, &exit_code)) {
     result = (exit_code == 0) ? RESULT_OK : RESULT_FAILED;
   } else {
     result = RESULT_FAILED;
   }
   done_callback.Run(result);
 }
 
 }  // namespace
 
 scoped_ptr<DaemonController> remoting::DaemonController::Create() {
   return scoped_ptr<DaemonController>(new DaemonControllerLinux());
 }
 
 }  // namespace remoting