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

BUG=125217


Review URL: http://codereview.chromium.org/10237012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134450 0039d316-1c4b-4281-b951-d872f2087c98

remoting/host/plugin/daemon_controller.h

@@ -65,12 +65,10 @@ class DaemonController {
     // them in the webapp.
   };
 
-  // The callback for GetConfig(). |config| is set to NULL in case of
-  // an error. Otherwise it is a dictionary that contains only the
-  // following values: host_id and xmpp_login, which may be empty if
-  // the host is not initialized yet. All other values are filtered out of the
-  // config before this callback is invoked: they may contain security
-  // sensitive information, such as authentication tokens and private keys.
+  // Callback type for GetConfig(). If the host is configured then a dictionary
+  // is returned containing host_id and xmpp_login, with security-sensitive
+  // fields filtered out. An empty dictionary is returned if the host is not
+  // configured, and NULL if the configuration is corrupt or cannot be read.
   typedef base::Callback<void (scoped_ptr<base::DictionaryValue> config)>
       GetConfigCallback;
 

remoting/host/plugin/daemon_controller_linux.cc

@@ -192,17 +192,23 @@ FilePath DaemonControllerLinux::GetConfigPath() {
 }
 
 void DaemonControllerLinux::DoGetConfig(const GetConfigCallback& callback) {
-  JsonHostConfig config(GetConfigPath());
-  scoped_ptr<base::DictionaryValue> result;
-  if (config.Read()) {
-    result.reset(new base::DictionaryValue());
-
-    std::string value;
-    if (config.GetString(kHostIdConfigPath, &value))
-      result->SetString(kHostIdConfigPath, value);
-    if (config.GetString(kXmppLoginConfigPath, &value))
-      result->SetString(kXmppLoginConfigPath, value);
+  scoped_ptr<base::DictionaryValue> result(new base::DictionaryValue());
+
+  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);
+      }
+      if (config.GetString(kXmppLoginConfigPath, &value)) {
+        result->SetString(kXmppLoginConfigPath, value);
+      }
+    } else {
+      result.reset(); // Return NULL in case of error.
+    }
   }
+
   callback.Run(result.Pass());
 }