Add base::ExecutableExistsInPath

net/proxy/proxy_config_service_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 "net/proxy/proxy_config_service_linux.h"
 
 #include <errno.h>
 #if defined(USE_GCONF)
 #include <gconf/gconf-client.h>
 #endif  // defined(USE_GCONF)
 #include <limits.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/inotify.h>
 #include <unistd.h>
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/debug/leak_annotations.h"
-#include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/nix/xdg_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
-#include "base/strings/string_split.h"
 #include "base/strings/string_tokenizer.h"
 #include "base/strings/string_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/timer/timer.h"
 #include "net/base/net_errors.h"
 #include "net/http/http_util.h"
 #include "net/proxy/proxy_config.h"
 #include "net/proxy/proxy_server.h"
 #include "url/url_canon.h"
 
@@ skipping 784 matching lines @@
   if (SchemaExists(kProxyGConfSchema)) {
     ANNOTATE_SCOPED_MEMORY_LEAK; // http://crbug.com/380782
     client = libgio_loader_.g_settings_new(kProxyGConfSchema);
   }
   if (!client) {
     VLOG(1) << "Cannot create gsettings client. Will fall back to gconf.";
     return false;
   }
   g_object_unref(client);
 
-  std::string path;
-  if (!env->GetVar("PATH", &path)) {
-    LOG(ERROR) << "No $PATH variable. Assuming no gnome-network-properties.";
-  } else {
-    // Yes, we're on the UI thread. Yes, we're accessing the file system.
-    // Sadly, we don't have much choice. We need the proxy settings and we
-    // need them now, and to figure out where to get them, we have to check
-    // for this binary. See http://crbug.com/69057 for additional details.
+  // Yes, we're on the UI thread. Yes, we're accessing the file system.
+  // Sadly, we don't have much choice. We need the proxy settings and we
+  // need them now, and to figure out where to get them, we have to check
+  // for this binary. See http://crbug.com/69057 for additional details.
+  {
     base::ThreadRestrictions::ScopedAllowIO allow_io;
-
-    for (const base::StringPiece& path_str : base::SplitStringPiece(
-             path, ":", base::KEEP_WHITESPACE, base::SPLIT_WANT_NONEMPTY)) {
-      base::FilePath file(path_str);
-      if (base::PathExists(file.Append("gnome-network-properties"))) {
-        VLOG(1) << "Found gnome-network-properties. Will fall back to gconf.";
-        return false;
-      }
+    if (base::ExecutableExistsInPath("gnome-network-properties")) {

[mattm, 2016/06/22 21:12:25]

This should probably accept the Environment to use as an argument? That would
avoid having to re-do the parsing if you already have one like here. 

Also the unittest uses a mock environment for testing. It doesn't seem to test
this condition explicitly but it might depend on it anyway. (eg, it may
pass/fail depending on whether the test system has the binary in path. I haven't
tried to verify if that actually happens but it seems worth preserving the old
behavior in any case.)

+      VLOG(1) << "Found gnome-network-properties. Will fall back to gconf.";
+      return false;
     }
   }
 
   VLOG(1) << "All gsettings tests OK. Will get proxy config from gsettings.";
   return true;
 }
 #endif  // defined(USE_GIO)
 
 // This is the KDE version that reads kioslaverc and simulates gconf.
 // Doing this allows the main Delegate code, as well as the unit tests
@@ skipping 920 matching lines @@
 void ProxyConfigServiceLinux::RemoveObserver(Observer* observer) {
   delegate_->RemoveObserver(observer);
 }
 
 ProxyConfigService::ConfigAvailability
     ProxyConfigServiceLinux::GetLatestProxyConfig(ProxyConfig* config) {
   return delegate_->GetLatestProxyConfig(config);
 }
 
 }  // namespace net