Add base::ExecutableExistsInPath

chrome/browser/ui/webui/settings_utils_linux.cc

 // Copyright 2016 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.
 
 #if !defined(OS_CHROMEOS)
 
 #include "chrome/browser/ui/webui/settings_utils.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/environment.h"
-#include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/nix/xdg_util.h"
 #include "base/process/launch.h"
-#include "base/strings/string_split.h"
-#include "base/strings/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 
 using content::BrowserThread;
 using content::OpenURLParams;
 using content::Referrer;
@@ skipping 36 matching lines @@
 }
 
 // Start the given proxy configuration utility.
 bool StartProxyConfigUtil(const char* command[]) {
   DCHECK_CURRENTLY_ON(BrowserThread::FILE);
   // base::LaunchProcess() returns true ("success") if the fork()
   // succeeds, but not necessarily the exec(). We'd like to be able to
   // use StartProxyConfigUtil() to search possible options and stop on
   // success, so we search $PATH first to predict whether the exec is
   // expected to succeed.
-  // TODO(mdm): this is a useful check, and is very similar to some
-  // code in proxy_config_service_linux.cc. It should probably be in
-  // base:: somewhere.
   std::unique_ptr<base::Environment> env(base::Environment::Create());
-  std::string path;
-  if (!env->GetVar("PATH", &path)) {
-    LOG(ERROR) << "No $PATH variable. Assuming no " << command[0] << ".";
-    return false;
-  }
-
-  bool found = false;
-  for (const base::StringPiece& cur_path :
-       base::SplitStringPiece(path, ":", base::KEEP_WHITESPACE,
-                              base::SPLIT_WANT_NONEMPTY)) {
-    base::FilePath file(cur_path);
-    if (base::PathExists(file.Append(command[0]))) {
-      found = true;
-      break;
-    }
-  }
-  if (!found)
+  if (!base::ExecutableExistsInPath(env.get(), command[0]))
     return false;
 
   std::vector<std::string> argv;
   for (size_t i = 0; command[i]; ++i)
     argv.push_back(command[i]);
   base::Process process = base::LaunchProcess(argv, base::LaunchOptions());
   if (!process.IsValid()) {
     LOG(ERROR) << "StartProxyConfigUtil failed to start " << command[0];
     return false;
   }
@@ skipping 53 matching lines @@
 void ShowNetworkProxySettings(content::WebContents* web_contents) {
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       base::Bind(&DetectAndStartProxyConfigUtil,
                  web_contents->GetRenderProcessHost()->GetID(),
                  web_contents->GetRenderViewHost()->GetRoutingID()));
 }
 
 }  // namespace settings_utils
 
 #endif  // !defined(OS_CHROMEOS)