Improves a code block in in_process_browser_test, avoids the use of FilePath:...

chrome/test/in_process_browser_test.cc

 // Copyright (c) 2006-2008 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/test/in_process_browser_test.h"
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
@@ skipping 93 matching lines @@
   command_line->AppendSwitch(switches::kNoFirstRun);
 
   // Single-process mode is not set in BrowserMain so it needs to be processed
   // explicitlty.
   original_single_process_ = RenderProcessHost::run_renderer_in_process();
   if (command_line->HasSwitch(switches::kSingleProcess))
     RenderProcessHost::set_run_renderer_in_process(true);
 
   // Explicitly set the path of the exe used for the renderer and plugin,
   // otherwise they'll try to use unit_test.exe.
-  std::wstring subprocess_path;
+  FilePath subprocess_path;
   PathService::Get(base::FILE_EXE, &subprocess_path);
-  FilePath fp_subprocess_path = FilePath::FromWStringHack(subprocess_path);
-  subprocess_path = fp_subprocess_path.DirName().ToWStringHack();
-  file_util::AppendToPath(&subprocess_path,
-                          chrome::kBrowserProcessExecutablePath);
+  subprocess_path = subprocess_path.DirName();
+  subprocess_path = subprocess_path.AppendASCII(WideToASCII(
+      chrome::kBrowserProcessExecutablePath));
   command_line->AppendSwitchWithValue(switches::kBrowserSubprocessPath,
-                                      subprocess_path);
+                                      subprocess_path.ToWStringHack());
 
   // Enable warning level logging so that we can see when bad stuff happens.
   command_line->AppendSwitch(switches::kEnableLogging);
   command_line->AppendSwitchWithValue(switches::kLoggingLevel,
                                       IntToWString(1));  // warning
 
   SandboxInitWrapper sandbox_wrapper;
   MainFunctionParams params(*command_line, sandbox_wrapper, NULL);
   params.ui_task =
       NewRunnableMethod(this, &InProcessBrowserTest::RunTestOnMainThreadLoop);
@@ skipping 125 matching lines @@
       NewRunnableMethod(this, &InProcessBrowserTest::TimedOut),
       kSubsequentTimeoutInMS);
 
   MessageLoopForUI::current()->Quit();
 }
 
 void InProcessBrowserTest::SetInitialTimeoutInMS(int timeout_value) {
   DCHECK_GT(timeout_value, 0);
   initial_timeout_ = timeout_value;
 }