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

pdf/document_loader.cc

Index: pdf/document_loader.cc
diff --git a/pdf/document_loader.cc b/pdf/document_loader.cc
index 03e82edbf4582bf3479d2864314dad0a35b381e3..165fffe88682e71f22ec5575377a61d2a9802db5 100644
--- a/pdf/document_loader.cc
+++ b/pdf/document_loader.cc
@@ -67,6 +67,15 @@ std::string GetMultiPartBoundary(const std::string& headers) {
   return std::string();
 }
 
+bool IsValidContentType(const std::string& type) {
+  return (EndsWith(type, "/pdf", false) ||
+          EndsWith(type, ".pdf", false) ||
+          EndsWith(type, "/x-pdf", false) ||
+          EndsWith(type, "/*", false) ||
+          EndsWith(type, "/acrobat", false) ||
+          EndsWith(type, "/unknown", false));
+}
+
 }  // namespace
 
 DocumentLoader::Client::~Client() {
@@ -106,7 +115,15 @@ bool DocumentLoader::Init(const pp::URLLoader& loader,
   uint32_t content_length = 0;
   std::string type;
   std::string disposition;
-  if (!response_headers.empty()) {
+
+  // This happens for PDFs not loaded from http(s) sources.
+  if (response_headers == "Content-Type: text/plain") {
+    if (!StartsWithASCII(url, "http://", false) &&
+        !StartsWithASCII(url, "https://", false)) {
+      type = "application/pdf";
+    }
+  }
+  if (type.empty() && !response_headers.empty()) {
     net::HttpUtil::HeadersIterator it(response_headers.begin(),
                                       response_headers.end(), "\n");
     while (it.GetNext()) {
@@ -128,18 +145,10 @@ bool DocumentLoader::Init(const pp::URLLoader& loader,
       }
     }
   }
-  if (!type.empty() &&
-      !EndsWith(type, "/pdf", false) &&
-      !EndsWith(type, ".pdf", false) &&
-      !EndsWith(type, "/x-pdf", false) &&
-      !EndsWith(type, "/*", false) &&
-      !EndsWith(type, "/acrobat", false) &&
-      !EndsWith(type, "/unknown", false)) {
+  if (!type.empty() && !IsValidContentType(type))
     return false;
-  }
-  if (StartsWithASCII(disposition, "attachment", false)) {
+  if (StartsWithASCII(disposition, "attachment", false))
     return false;
-  }
 
   if (content_length > 0)
     chunk_stream_.Preallocate(content_length);