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

chrome/browser/extensions/extension_function.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_function.h"
 
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "chrome/browser/extensions/extension_function_dispatcher.h"
 #include "chrome/browser/extensions/extension_service.h"
@@ skipping 25 matching lines @@
 void UIThreadExtensionFunction::RenderViewHostTracker::Observe(
     int type,
     const content::NotificationSource& source,
     const content::NotificationDetails& details) {
   CHECK(type == content::NOTIFICATION_RENDER_VIEW_HOST_DELETED);
   CHECK(content::Source<RenderViewHost>(source).ptr() ==
         function_->render_view_host());
   function_->SetRenderViewHost(NULL);
 }
 
+UIThreadExtensionFunction::ExtensionRenderViewHostObserver::
+    ExtensionRenderViewHostObserver(UIThreadExtensionFunction* function,
+                                    RenderViewHost* render_view_host)
+    : RenderViewHostObserver(render_view_host),
+      function_(function) {
+}
+
+void UIThreadExtensionFunction::ExtensionRenderViewHostObserver::
+    RenderViewHostDestroyed(RenderViewHost* render_view_host) {
+  // Default behavior is to delete this.

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

This comment is kind of confusing - do you mean that the default behavor of the
RenderViewHostDestroyed function from the superclass is to delete |this|?

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

Yes. Clarified comment.

+  // In our case, we'll be deleted when the UIThreadExtensionFunction containing
+  // us goes away.
+}
+
+bool UIThreadExtensionFunction::ExtensionRenderViewHostObserver::
+    OnMessageReceived(const IPC::Message& message) {
+  return function_->OnMessageReceivedFromRenderView(message);
+}
+
 ExtensionFunction::ExtensionFunction()
     : request_id_(-1),
       profile_id_(NULL),
       has_callback_(false),
       include_incognito_(false),
       user_gesture_(false),
       args_(NULL),
       bad_message_(false) {
 }
 
@@ skipping 76 matching lines @@
 }
 
 UIThreadExtensionFunction::~UIThreadExtensionFunction() {
 }
 
 UIThreadExtensionFunction*
 UIThreadExtensionFunction::AsUIThreadExtensionFunction() {
   return this;
 }
 
+bool UIThreadExtensionFunction::OnMessageReceivedFromRenderView(
+    const IPC::Message& message) {
+  return false;
+}
+
 void UIThreadExtensionFunction::Destruct() const {
   BrowserThread::DeleteOnUIThread::Destruct(this);
 }
 
 void UIThreadExtensionFunction::SetRenderViewHost(
     RenderViewHost* render_view_host) {
   render_view_host_ = render_view_host;
+  render_view_host_observer_.reset(render_view_host_ ?
+      new ExtensionRenderViewHostObserver(this, render_view_host) : NULL);
   tracker_.reset(render_view_host ? new RenderViewHostTracker(this) : NULL);
 }
 
 Browser* UIThreadExtensionFunction::GetCurrentBrowser() {
   return dispatcher()->GetCurrentBrowser(render_view_host_, include_incognito_);
 }
 
 void UIThreadExtensionFunction::SendResponse(bool success) {
   if (!render_view_host_ || !dispatcher())
     return;
@@ skipping 46 matching lines @@
 
 SyncIOThreadExtensionFunction::SyncIOThreadExtensionFunction() {
 }
 
 SyncIOThreadExtensionFunction::~SyncIOThreadExtensionFunction() {
 }
 
 void SyncIOThreadExtensionFunction::Run() {
   SendResponse(RunImpl());
 }