Move path functions from file_util to FilePath object.

chrome/browser/shell_integration.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/shell_integration.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 60 matching lines @@
   CommandLine new_cmd_line(CommandLine::NO_PROGRAM);
 
   // Use the same UserDataDir for new launches that we currently have set.
   base::FilePath user_data_dir =
       cmd_line.GetSwitchValuePath(switches::kUserDataDir);
 #if defined(OS_MACOSX) || defined(OS_WIN)
   policy::path_parser::CheckUserDataDirPolicy(&user_data_dir);
 #endif
   if (!user_data_dir.empty()) {
     // Make sure user_data_dir is an absolute path.
-    if (file_util::AbsolutePath(&user_data_dir) &&
-        file_util::PathExists(user_data_dir)) {
+    user_data_dir = base::MakeAbsoluteFilePath(user_data_dir);
+    if (!user_data_dir.empty() && file_util::PathExists(user_data_dir))
       new_cmd_line.AppendSwitchPath(switches::kUserDataDir, user_data_dir);
-    }
   }
 
 #if defined(OS_CHROMEOS)
   base::FilePath profile = cmd_line.GetSwitchValuePath(
       chromeos::switches::kLoginProfile);
   if (!profile.empty())
     new_cmd_line.AppendSwitchPath(chromeos::switches::kLoginProfile, profile);
 #else
   if (!profile_path.empty() && !extension_app_id.empty())
     new_cmd_line.AppendSwitchPath(switches::kProfileDirectory,
@@ skipping 202 matching lines @@
         result = ShellIntegration::SetAsDefaultProtocolClientInteractive(
             protocol_);
       }
       break;
     default:
       NOTREACHED();
   }
 
   return result;
 }