Don't read Linux host configuration if binary is not on path.

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 174 matching lines @@
   // noop
 }
 
 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) {
-  JsonHostConfig config(GetConfigPath());
-  scoped_ptr<base::DictionaryValue> result;
-  if (config.Read()) {
-    result.reset(new base::DictionaryValue());
+  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
 
-    std::string value;
-    if (config.GetString(kHostIdConfigPath, &value))
-      result->SetString(kHostIdConfigPath, value);
-    if (config.GetString(kXmppLoginConfigPath, &value))
-      result->SetString(kXmppLoginConfigPath, value);
+  if (GetState() != remoting::DaemonController::STATE_NOT_IMPLEMENTED) {
+    JsonHostConfig config(GetConfigPath());
+    if (config.Read()) {
+      std::string value;
+      if (config.GetString(kHostIdConfigPath, &value))
+        result->SetString(kHostIdConfigPath, value);

[Sergey Ulanov, 2012/04/27 01:29:22]

nit: add {} to match style of other ifs in this file.

[Wez, 2012/04/28 05:16:37]

Done.

+      if (config.GetString(kXmppLoginConfigPath, &value))
+        result->SetString(kXmppLoginConfigPath, value);
+    } else {
+      result.reset(); // Return NULL in case of error.
+    }
   }
+
   callback.Run(result.Pass());
 }
 
 void DaemonControllerLinux::DoSetConfigAndStart(
     scoped_ptr<base::DictionaryValue> config,
     const CompletionCallback& done_callback) {
   std::vector<std::string> args;
   args.push_back("--explicit-config");
   std::string config_json;
   base::JSONWriter::Write(config.get(), &config_json);
@@ skipping 44 matching lines @@
   done_callback.Run(result);
 }
 
 }  // namespace
 
 scoped_ptr<DaemonController> remoting::DaemonController::Create() {
   return scoped_ptr<DaemonController>(new DaemonControllerLinux());
 }
 
 }  // namespace remoting