Deprecate more old filepath functions.

chrome/browser/shell_integration.cc

 // Copyright (c) 2009 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/command_line.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/browser/chrome_thread.h"
 
 std::string ShellIntegration::GetCommandLineArgumentsCommon(const GURL& url,
     const string16& extension_app_id) {
   const CommandLine cmd = *CommandLine::ForCurrentProcess();
   std::wstring arguments_w;
 
   // Use the same UserDataDir for new launches that we currently have set.
-  std::wstring user_data_dir = cmd.GetSwitchValue(switches::kUserDataDir);
-  if (!user_data_dir.empty()) {
+  FilePath user_data_dir = cmd.GetSwitchValuePath(switches::kUserDataDir);
+  if (!user_data_dir.value().empty()) {
     // Make sure user_data_dir is an absolute path.
     if (file_util::AbsolutePath(&user_data_dir) &&
-        file_util::PathExists(FilePath::FromWStringHack(user_data_dir))) {
+        file_util::PathExists(user_data_dir)) {
       arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kUserDataDir) +

[tfarina, 2010/07/08 17:33:11]

There is a TODO in some other place about using the command line API, would be
good to add one here too?

[Evan Martin, 2010/07/08 17:48:47]

Done.

-                     L"=\"" + user_data_dir + L"\" ";
+                     L"=\"" + user_data_dir.ToWStringHack() + L"\" ";
     }
   }
 
 #if defined (OS_CHROMEOS)
   std::wstring profile = cmd.GetSwitchValue(switches::kProfile);
   if (!profile.empty()) {
     arguments_w += std::wstring(L"--") + ASCIIToWide(switches::kProfile) +
                    L"=\"" + profile + L"\" ";
   }
 #endif
@@ skipping 101 matching lines @@
         observer_->SetDefaultBrowserUIState(STATE_IS_DEFAULT);
         break;
       case UNKNOWN_DEFAULT_BROWSER:
         observer_->SetDefaultBrowserUIState(STATE_UNKNOWN);
         break;
       default:
         break;
     }
   }
 }