| Index: components/crash/content/app/crash_reporter_client.h
 | 
| diff --git a/components/crash/content/app/crash_reporter_client.h b/components/crash/content/app/crash_reporter_client.h
 | 
| index 66002a902c431cb07b8b4283d15709e54a17ae73..157ba53e1361493bcc4632caafa01b0052d8c4ea 100644
 | 
| --- a/components/crash/content/app/crash_reporter_client.h
 | 
| +++ b/components/crash/content/app/crash_reporter_client.h
 | 
| @@ -12,9 +12,11 @@
 | 
|  #include "base/strings/string16.h"
 | 
|  #include "build/build_config.h"
 | 
|  
 | 
| +#if !defined(OS_WIN)
 | 
|  namespace base {
 | 
|  class FilePath;
 | 
|  }
 | 
| +#endif
 | 
|  
 | 
|  #if defined(OS_MACOSX)
 | 
|  // We don't want to directly include
 | 
| @@ -66,11 +68,11 @@ class CrashReporterClient {
 | 
|  
 | 
|    // Returns true if an alternative location to store the minidump files was
 | 
|    // specified. Returns true if |crash_dir| was set.
 | 
| -  virtual bool GetAlternativeCrashDumpLocation(base::FilePath* crash_dir);
 | 
| +  virtual bool GetAlternativeCrashDumpLocation(base::string16* crash_dir);
 | 
|  
 | 
|    // Returns a textual description of the product type and version to include
 | 
|    // in the crash report.
 | 
| -  virtual void GetProductNameAndVersion(const base::FilePath& exe_path,
 | 
| +  virtual void GetProductNameAndVersion(const base::string16& exe_path,
 | 
|                                          base::string16* product_name,
 | 
|                                          base::string16* version,
 | 
|                                          base::string16* special_build,
 | 
| @@ -92,7 +94,7 @@ class CrashReporterClient {
 | 
|    virtual bool GetDeferredUploadsSupported(bool is_per_user_install);
 | 
|  
 | 
|    // Returns true if the running binary is a per-user installation.
 | 
| -  virtual bool GetIsPerUserInstall(const base::FilePath& exe_path);
 | 
| +  virtual bool GetIsPerUserInstall(const base::string16& exe_path);
 | 
|  
 | 
|    // Returns true if larger crash dumps should be dumped.
 | 
|    virtual bool GetShouldDumpLargerDumps(bool is_per_user_install);
 | 
| @@ -120,7 +122,11 @@ class CrashReporterClient {
 | 
|  
 | 
|    // The location where minidump files should be written. Returns true if
 | 
|    // |crash_dir| was set.
 | 
| +#if defined(OS_WIN)
 | 
| +  virtual bool GetCrashDumpLocation(base::string16* crash_dir);
 | 
| +#else
 | 
|    virtual bool GetCrashDumpLocation(base::FilePath* crash_dir);
 | 
| +#endif
 | 
|  
 | 
|    // Register all of the potential crash keys that can be sent to the crash
 | 
|    // reporting server. Returns the size of the union of all keys.
 | 
| 
 |