PDF: Cleanup more code now that it is completely out of process.

pdf/pdfium/pdfium_engine.cc

 // Copyright (c) 2012 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 "pdf/pdfium/pdfium_engine.h"
 
 #include <math.h>
 
 #include "base/i18n/icu_encoding_detection.h"
 #include "base/i18n/icu_string_conversions.h"
@@ skipping 923 matching lines @@
 
 FPDF_FILEHANDLER* PDFiumEngine::Form_OpenFile(FPDF_FORMFILLINFO* param,
                                               int file_flag,
                                               FPDF_WIDESTRING url,
                                               const char* mode) {
   std::string url_str = "NULL";
   if (url != NULL) {
     url_str =
         base::UTF16ToUTF8(reinterpret_cast<const base::char16*>(url));
   }
-  //  TODO: need to implement open file from the url
-  //  Use a file path for the ease of testing
+  // TODO: need to implement open file from the url
+  // Use a file path for the ease of testing
   FILE* file = fopen(XFA_TESTFILE("tem.txt"), mode);
   FPDF_FILE* file_wrapper = new FPDF_FILE;
   file_wrapper->file = file;
   file_wrapper->file_handler.clientData = file_wrapper;
   file_wrapper->file_handler.Flush = Sample_Flush;
   file_wrapper->file_handler.GetSize = Sample_GetSize;
   file_wrapper->file_handler.ReadBlock = Sample_ReadBlock;
   file_wrapper->file_handler.Release = Sample_Release;
   file_wrapper->file_handler.Truncate = Sample_Truncate;
   file_wrapper->file_handler.WriteBlock = Sample_WriteBlock;
@@ skipping 29 matching lines @@
   return file_avail->loader->IsDataAvailable(offset, size);
 }
 
 void PDFiumEngine::AddSegment(FX_DOWNLOADHINTS* param,
                               size_t offset, size_t size) {
   PDFiumEngine::DownloadHints* download_hints =
       static_cast<PDFiumEngine::DownloadHints*>(param);
   return download_hints->loader->RequestData(offset, size);
 }
 
-bool PDFiumEngine::New(const char* url) {
-  url_ = url;
-  headers_ = std::string();
-  return true;
-}
-
 bool PDFiumEngine::New(const char* url,
                        const char* headers) {
   url_ = url;
   if (!headers)
-    headers_ = std::string();
+    headers_.clear();
   else
     headers_ = headers;
   return true;
 }
 
 void PDFiumEngine::PageOffsetUpdated(const pp::Point& page_offset) {
   page_offset_ = page_offset;
 }
 
 void PDFiumEngine::PluginSizeUpdated(const pp::Size& size) {
@@ skipping 220 matching lines @@
   called_do_document_action_ = true;
 
   // These can only be called now, as the JS might end up needing a page.
   FORM_DoDocumentJSAction(form_);
   FORM_DoDocumentOpenAction(form_);
   if (most_visible_page_ != -1) {
     FPDF_PAGE new_page = pages_[most_visible_page_]->GetPage();
     FORM_DoPageAAction(new_page, form_, FPDFPAGE_AACTION_OPEN);
   }
 
-  if (doc_) // This can only happen if loading |doc_| fails.
+  if (doc_)  // This can only happen if loading |doc_| fails.
     client_->DocumentLoadComplete(pages_.size());
 }
 
 void PDFiumEngine::UnsupportedFeature(int type) {
   std::string feature;
   switch (type) {
 #ifndef PDF_USE_XFA
     case FPDF_UNSP_DOC_XFAFORM:
       feature = "XFA";
       break;
@@ skipping 739 matching lines @@
       last_character_index_to_search_ = old_selection[0].char_index();
       character_to_start_searching_from = old_selection[0].char_index();
       last_page_to_search_ = next_page_to_search_;
     }
   }
 
   int current_page = next_page_to_search_;
 
   if (pages_[current_page]->available()) {
     base::string16 str = base::UTF8ToUTF16(text);
-    // Don't use PDFium to search for now, since it doesn't support unicode text.
-    // Leave the code for now to avoid bit-rot, in case it's fixed later.
+    // Don't use PDFium to search for now, since it doesn't support unicode
+    // text. Leave the code for now to avoid bit-rot, in case it's fixed later.
     if (0) {
       SearchUsingPDFium(
           str, case_sensitive, first_search, character_to_start_searching_from,
           current_page);
     } else {
       SearchUsingICU(
           str, case_sensitive, first_search, character_to_start_searching_from,
           current_page);
     }
 
@@ skipping 458 matching lines @@
 
   // Convert |page_size| back to points.
   size->set_width(
       ConvertUnit(page_size.width(), kPixelsPerInch, kPointsPerInch));
   size->set_height(
       ConvertUnit(page_size.height(), kPixelsPerInch, kPointsPerInch));
   return true;
 }
 
 void PDFiumEngine::AppendBlankPages(int num_pages) {
-  DCHECK(num_pages != 0);
+  DCHECK_NE(num_pages, 0);
 
   if (!doc_)
     return;
 
   selection_.clear();
   pending_pages_.clear();
 
   // Delete all pages except the first one.
   while (pages_.size() > 1) {
     delete pages_.back();
@@ skipping 1522 matching lines @@
     double* height) {
   FPDF_DOCUMENT doc = FPDF_LoadMemDocument(pdf_buffer, pdf_buffer_size, NULL);
   if (!doc)
     return false;
   bool success = FPDF_GetPageSizeByIndex(doc, page_number, width, height) != 0;
   FPDF_CloseDocument(doc);
   return success;
 }
 
 }  // namespace chrome_pdf