Put history insertion for downloads processing inline.

chrome/browser/download/download_manager_unittest.cc

 // Copyright (c) 2010 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 <string>
 
 #include "base/string_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/download/download_file.h"
@@ skipping 139 matching lines @@
 
 namespace {
 
 const struct {
   FilePath::StringType suggested_path;
   bool is_dangerous;
   bool finish_before_rename;
   bool will_delete_crdownload;
   int expected_rename_count;
 } kDownloadRenameCases[] = {
-  // Safe download, download finishes BEFORE rename.
-  // Needs to be renamed only once.  Crdownload file needs to be deleted.
+  // Safe download, download finishes BEFORE file name determined.
+  // Renamed twice (linear path through UI).  Crdownload file does not need
+  // to be deleted.
   { FILE_PATH_LITERAL("foo.zip"),
     false,
     true,
-    true,
-    1, },
-  // Dangerous download, download finishes BEFORE rename.
+    false,
+    2, },
+  // Dangerous download, download finishes BEFORE file name determined.
   // Needs to be renamed only once.
   { FILE_PATH_LITERAL("unconfirmed xxx.crdownload"),
     true,
     true,
     false,
     1, },
-  // Safe download, download finishes AFTER rename.
+  // Safe download, download finishes AFTER file name determined.
   // Needs to be renamed twice.
   { FILE_PATH_LITERAL("foo.zip"),
     false,
     false,
     false,
     2, },
-  // Dangerous download, download finishes AFTER rename.
+  // Dangerous download, download finishes AFTER file name determined.
   // Needs to be renamed only once.
   { FILE_PATH_LITERAL("unconfirmed xxx.crdownload"),
     true,
     false,
     false,
     1, },
 };
 
 class MockDownloadFile : public DownloadFile {
  public:
@@ skipping 66 matching lines @@
       download_manager_->OnAllDataSaved(i, 1024);
       download_manager_->FileSelected(new_path, i, info);
     } else {
       download_manager_->FileSelected(new_path, i, info);
       download_manager_->OnAllDataSaved(i, 1024);
     }
 
     message_loop_.RunAllPending();
   }
 }