Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

1 files changed, 6 insertions, 4 deletions

diff --git a/content/browser/download/mhtml_generation_manager.h b/content/browser/download/mhtml_generation_manager.h
index 54b8733dd3..ffdb95b680 100644
--- a/content/browser/download/mhtml_generation_manager.h
+++ b/content/browser/download/mhtml_generation_manager.h
@@ -12,7 +12,9 @@
 #include "base/process.h"
 #include "ipc/ipc_platform_file.h"
 
+namespace base {
 class FilePath;
+}
 
 namespace content {
 class WebContents;
@@ -21,13 +23,13 @@ class MHTMLGenerationManager {
  public:
   static MHTMLGenerationManager* GetInstance();
 
-  typedef base::Callback<void(const FilePath& /* path to the MHTML file */,
+  typedef base::Callback<void(const base::FilePath& /* path to the MHTML file */,
       int64 /* size of the file */)> GenerateMHTMLCallback;
 
   // Instructs the render view to generate a MHTML representation of the current
   // page for |web_contents|.
   void GenerateMHTML(WebContents* web_contents,
-                     const FilePath& file,
+                     const base::FilePath& file,
                      const GenerateMHTMLCallback& callback);
 
   // Notification from the renderer that the MHTML generation finished.
@@ -42,7 +44,7 @@ class MHTMLGenerationManager {
     Job();
     ~Job();
 
-    FilePath file_path;
+    base::FilePath file_path;
 
     // The handles to file the MHTML is saved to, for the browser and renderer
     // processes.
@@ -62,7 +64,7 @@ class MHTMLGenerationManager {
 
   // Called on the file thread to create |file|.
   void CreateFile(int job_id,
-                  const FilePath& file,
+                  const base::FilePath& file,
                   base::ProcessHandle renderer_process);
 
   // Called on the UI thread when the file that should hold the MHTML data has