Assertion removed in print_preview_pdf_generated.cc.

chrome/browser/printing/print_preview_pdf_generated_browsertest.cc

 // Copyright 2014 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 <algorithm>
 #include <fstream>
 #include <iostream>
 #include <iterator>
 #include <limits>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "base/bind.h"
+#include "base/callback.h"
 #include "base/file_util.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/logging.h"
 #include "base/md5.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/scoped_native_library.h"
@@ skipping 153 matching lines @@
     } else if (state_ == kWaitingToSendBackgroundColorsAndImages) {
       script_argument.SetBoolean("backgroundColorsAndImages",
                                  settings_->background_colors_and_images);
       state_ = kWaitingToSendMargins;
       failed_setting_ = "Background Colors and Images";
     } else if (state_ == kWaitingToSendMargins) {
       script_argument.SetInteger("margins", settings_->margins);
       state_ = kWaitingForFinalMessage;
       failed_setting_ = "Margins";
     } else if (state_ == kWaitingForFinalMessage) {
       EndLoop();

[Lei Zhang, 2014/07/22 00:11:30]

Actually, do you need this EndLoop() call? It seems weird that on the success
code path, EndLoop() gets called twice.

[ivandavid, 2014/07/22 02:40:26]

Oooo. I didn't really think about this. I removed Print() and now I only have
the message loop in NavigateAndPreview (now NavigateAndPrint).

[ivandavid, 2014/07/22 02:40:26]

Done.

       return;
     }
 
     ASSERT_FALSE(script_argument.empty());
     GetUI()->web_ui()->CallJavascriptFunction(
         "onManipulateSettingsForTest", script_argument);
   }
 
   // Saves the print preview settings to be sent to the print preview dialog.
   void SetPrintPreviewSettings(const PrintPreviewSettings& settings) {
@@ skipping 67 matching lines @@
     ui->web_ui()->AddMessageHandler(new UIDoneLoadingMessageHandler(this));
     ui->web_ui()->CallJavascriptFunction("onEnableManipulateSettingsForTest");
   }
 
   virtual void DidCloneToNewWebContents(
       WebContents* old_web_contents,
       WebContents* new_web_contents) OVERRIDE {
     Observe(new_web_contents);
   }
 
-  virtual void WebContentsDestroyed() OVERRIDE {
-    EndLoop();
-  }
-
   Browser* browser_;
   base::Closure quit_closure_;
   scoped_ptr<PrintPreviewSettings> settings_;
 
   // State of the observer. The state indicates what message to send
   // next. The state advances whenever the message handler calls
   // ManipulatePreviewSettings() on the observer.
   State state_;
   std::string failed_setting_;
 
@@ skipping 20 matching lines @@
     chrome::Print(browser());
     loop.Run();
   }
 
   // Prints the web page to a PDF. NavigateAndPreview must be called first.
   void Print() {
     ASSERT_FALSE(pdf_file_save_path_.empty());
 
     base::RunLoop loop;
     print_preview_observer_->set_quit_closure(loop.QuitClosure());
+
+    // Callback that is called by PrintPreviewHandler and ends
+    // |print_preview_observer|'s message loop when the file has been saved.
+    base::Closure callback =
+        base::Bind(&PrintPreviewObserver::EndLoop,
+                   base::Unretained(print_preview_observer_.get()));
+    print_preview_observer_->GetUI()->SetCallbackForTesting(&callback);
+
     print_preview_observer_->GetUI()->SetSelectedFileForTesting(
         pdf_file_save_path_);
     loop.Run();
-
-    // Checks to see if the file exists and is readable. If the file doesn't
-    // exist, the test will fail. If it exists, but isn't readable, the test
-    // will keep polling until the file becomes readable. This is due to a
-    // problem on Windows where the file exists, but isn't readable, causing
-    // other ASSERT statements in this test to fail.
-    // TODO(ivandavid): Come up with a better way to do this.
-    ASSERT_TRUE(base::PathExists(pdf_file_save_path_));
-    while (true) {
-      base::File pdf_file(
-          pdf_file_save_path_, base::File::FLAG_OPEN | base::File::FLAG_READ);
-      if (pdf_file.IsValid())
-        break;
-    }
   }
 
   // Initializes function pointers from the PDF library. Called once when the
   // test starts. The library is closed when the browser test ends.
   void InitPdfFunctions() {
     base::FilePath pdf_module_path;
 
     ASSERT_TRUE(PathService::Get(chrome::FILE_PDF_PLUGIN, &pdf_module_path));
     ASSERT_TRUE(base::PathExists(pdf_module_path));
     pdf_lib_.Reset(base::LoadNativeLibrary(pdf_module_path, NULL));
@@ skipping 363 matching lines @@
     // waiting for this message and start waiting for the image data.
     std::cout << "#EOF\n";
     std::cout.flush();
 
     SendPng();
     Reset();
   }
 }
 
 }  // namespace printing