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

chrome/test/base/ui_test_utils.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/test/base/ui_test_utils.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 210 matching lines @@
   ListValue* list = static_cast<ListValue*>(root_val.get());
   Value* result_val;
   if (!list || !list->GetSize() ||
       !list->Remove(0, &result_val))  // Remove gives us ownership of the value.
     return false;
 
   result->reset(result_val);
   return true;
 }
 
+void RunAllPendingMessageAndSendQuit(content::BrowserThread::ID thread_id) {
+  MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());

[sky, 2011/11/18 23:24:56]

Can you use RunAllPendingInMessageLoop again here? You'll likely need to change
RunMessageLoop to deal with a non-ui thread, but that seems like a good thing
anyway.

[Jay Civelli, 2011/11/19 00:01:12]

Done.

+  MessageLoop* loop = MessageLoop::current();
+  bool did_allow_task_nesting = loop->NestableTasksAllowed();
+  loop->SetNestableTasksAllowed(true);
+  loop->Run();
+  loop->SetNestableTasksAllowed(did_allow_task_nesting);
+  content::BrowserThread::PostTask(thread_id, FROM_HERE,
+                                   new MessageLoop::QuitTask());
+}
+
 }  // namespace
 
 void RunMessageLoop() {
   MessageLoopForUI* loop = MessageLoopForUI::current();
   bool did_allow_task_nesting = loop->NestableTasksAllowed();
   loop->SetNestableTasksAllowed(true);
 #if defined(USE_AURA)
   aura::Desktop::GetInstance()->Run();
 #elif defined(TOOLKIT_VIEWS)
   views::AcceleratorHandler handler;
   loop->RunWithDispatcher(&handler);
 #elif defined(OS_POSIX) && !defined(OS_MACOSX)
   loop->RunWithDispatcher(NULL);
 #else
   loop->Run();
 #endif
   loop->SetNestableTasksAllowed(did_allow_task_nesting);
 }
 
 void RunAllPendingInMessageLoop() {
   MessageLoop::current()->PostTask(FROM_HERE, new MessageLoop::QuitTask());
   ui_test_utils::RunMessageLoop();
 }
 
+void RunAllPendingInMessageLoop(content::BrowserThread::ID thread_id) {
+  if (content::BrowserThread::CurrentlyOn(thread_id)) {
+    RunAllPendingInMessageLoop();
+    return;
+  }
+  content::BrowserThread::ID current_thread_id;
+  if (!content::BrowserThread::GetCurrentThreadIdentifier(&current_thread_id)) {
+    NOTREACHED();
+    return;
+  }
+  content::BrowserThread::PostTask(thread_id, FROM_HERE,
+      base::Bind(&RunAllPendingMessageAndSendQuit, current_thread_id));
+
+  ui_test_utils::RunMessageLoop();
+}
+

[sky, 2011/11/18 23:24:56]

nit: remove line.

[Jay Civelli, 2011/11/19 00:01:12]

Done.

+
 bool GetCurrentTabTitle(const Browser* browser, string16* title) {
   TabContents* tab_contents = browser->GetSelectedTabContents();
   if (!tab_contents)
     return false;
   NavigationEntry* last_entry = tab_contents->controller().GetActiveEntry();
   if (!last_entry)
     return false;
   title->assign(last_entry->GetTitleForDisplay(""));
   return true;
 }
@@ skipping 730 matching lines @@
   return taker.TakeRenderWidgetSnapshot(rwh, page_size, page_size, bitmap);
 }
 
 bool TakeEntirePageSnapshot(RenderViewHost* rvh, SkBitmap* bitmap) {
   DCHECK(bitmap);
   SnapshotTaker taker;
   return taker.TakeEntirePageSnapshot(rvh, bitmap);
 }
 
 }  // namespace ui_test_utils