Delete the temporary file when generating MHTML with the extension API.

chrome/browser/extensions/extension_save_page_api.cc

 // Copyright (c) 2011 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/extensions/extension_save_page_api.h"
 
 #include "base/file_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
+#include "chrome/common/extensions/extension_messages.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/download/mhtml_generation_manager.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 
 using content::BrowserThread;
 
@@ skipping 14 matching lines @@
 bool SavePageAsMHTMLFunction::RunImpl() {
   EXTENSION_FUNCTION_VALIDATE(args_->GetInteger(0, &tab_id_));
 
   AddRef();  // Balanced in ReturnFailure/ReturnSuccess()
 
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &SavePageAsMHTMLFunction::CreateTemporaryFile));
   return true;
 }
 
+bool SavePageAsMHTMLFunction::OnMessageReceivedFromRenderView(
+    const IPC::Message& message) {
+  if (message.type() != ExtensionHostMsg_ResponseAck::ID)
+    return false;
+
+  int message_request_id;
+  void* iter = NULL;
+  if (!message.ReadInt(&iter, &message_request_id)) {
+    NOTREACHED() << "malformed extension message";
+    return true;
+  }
+
+  if (message_request_id != request_id())
+    return false;
+
+  // The extension process has processed the response and has created a
+  // reference to the blob, it is safe for us to go away.
+  Release();  // Balanced in Run()
+
+  return true;
+}
+
 void SavePageAsMHTMLFunction::CreateTemporaryFile() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   // TODO(jcivelli): http://crbug.com/97489 we don't clean-up the temporary file
   //                 at this point.  It must be done before we can take that API
   //                 out of experimental.
   bool success = file_util::CreateTemporaryFile(&mhtml_path_);
   BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this, &SavePageAsMHTMLFunction::TemporaryFileCreated,
                         success));
 }
 
 void SavePageAsMHTMLFunction::TemporaryFileCreated(bool success) {
   if (!success) {
     ReturnFailure(kTemporaryFileError);
     return;
   }
 
-  Browser* browser = NULL;
-  TabContentsWrapper* tab_contents_wrapper = NULL;
+  // Sets a DeletableFileReference so the temporary file gets deleted once it is
+  // no longer used.
+  mhtml_file_ = webkit_blob::DeletableFileReference::GetOrCreate(mhtml_path_,
+      BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
 
-  if (!ExtensionTabUtil::GetTabById(tab_id_, profile(), include_incognito(),
-      &browser, NULL, &tab_contents_wrapper, NULL)) {
+
+  TabContents* tab_contents = GetTabContents();
+  if (!tab_contents) {
     ReturnFailure(kTabClosedError);
     return;
   }
 
-  TabContents* tab_contents = tab_contents_wrapper->tab_contents();
   registrar_.Add(
       this, content::NOTIFICATION_MHTML_GENERATED,
       content::Source<RenderViewHost>(tab_contents->render_view_host()));
   // TODO(jcivelli): we should listen for navigation in the tab, tab closed,
   //                 renderer died.
   g_browser_process->mhtml_generation_manager()->GenerateMHTML(
       tab_contents, mhtml_path_);
 }
 
 void SavePageAsMHTMLFunction::Observe(
@@ skipping 35 matching lines @@
   error_ = error;
 
   SendResponse(false);
 
   Release();  // Balanced in Run()
 }
 
 void SavePageAsMHTMLFunction::ReturnSuccess(int64 file_size) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
+  TabContents* tab_contents = GetTabContents();
+  if (!tab_contents) {
+    ReturnFailure(kTabClosedError);
+    return;
+  }
+
   int child_id = render_view_host()->process()->id();
   ChildProcessSecurityPolicy::GetInstance()->GrantReadFile(
       child_id, mhtml_path_);
 
   DictionaryValue* dict = new DictionaryValue();
   result_.reset(dict);
   dict->SetString("mhtmlFilePath", mhtml_path_.value());
   dict->SetInteger("mhtmlFileLength", file_size);
 
   SendResponse(true);
 
-  Release();  // Balanced in Run()
+  // Note that we'll wait for a response ack message before we call Release()

[asargent_no_longer_on_chrome, 2011/11/15 18:56:31]

nit: might be worth mentioning that where this happens is in
OnMessageReceivedFromRenderView

[Jay Civelli, 2011/11/18 23:14:32]

Done.

+  // (to prevent the blob file from being deleted).
 }
+
+TabContents* SavePageAsMHTMLFunction::GetTabContents() {
+    Browser* browser = NULL;

[Mihai Parparita -not on Chrome, 2011/11/15 18:51:42]

Body of this function is indented one too many times.

[Jay Civelli, 2011/11/18 23:14:32]

Done.

+    TabContentsWrapper* tab_contents_wrapper = NULL;
+
+    if (!ExtensionTabUtil::GetTabById(tab_id_, profile(), include_incognito(),
+        &browser, NULL, &tab_contents_wrapper, NULL)) {
+      return NULL;
+    }
+    return tab_contents_wrapper->tab_contents();
+}