Move path functions from file_util to FilePath object.

chrome/browser/ui/webui/version_handler.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 "chrome/browser/ui/webui/version_handler.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/metrics/field_trial.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/plugins/plugin_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/metrics/variations/variations_util.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/web_ui.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "webkit/plugins/plugin_constants.h"
 
 namespace {
 
 // Retrieves the executable and profile paths on the FILE thread.
 void GetFilePaths(const base::FilePath& profile_path,
                   string16* exec_path_out,
                   string16* profile_path_out) {
   DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::FILE));
 
-  base::FilePath executable_path =
-      CommandLine::ForCurrentProcess()->GetProgram();
-  if (file_util::AbsolutePath(&executable_path)) {
+  base::FilePath executable_path = base::MakeAbsoluteFilePath(
+      CommandLine::ForCurrentProcess()->GetProgram());
+  if (!executable_path.empty()) {
     *exec_path_out = executable_path.LossyDisplayName();
   } else {
     *exec_path_out =
         l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_PATH_NOTFOUND);
   }
 
-  base::FilePath profile_path_copy(profile_path);
-  if (!profile_path.empty() && file_util::AbsolutePath(&profile_path_copy)) {
+  base::FilePath profile_path_copy(base::MakeAbsoluteFilePath(profile_path));
+  if (!profile_path.empty() && !profile_path_copy.empty()) {
     *profile_path_out = profile_path.LossyDisplayName();
   } else {
     *profile_path_out =
         l10n_util::GetStringUTF16(IDS_ABOUT_VERSION_PATH_NOTFOUND);
   }
 }
 
 }  // namespace
 
 VersionHandler::VersionHandler()
@@ skipping 93 matching lines @@
         flash_version = info_array[i].version;
         break;
       }
     }
   }
 
   StringValue arg(flash_version);
   web_ui()->CallJavascriptFunction("returnFlashVersion", arg);
 }
 #endif  // defined(ENABLE_PLUGINS)