Fixing mime type so that MHTML files can be opened directly from Google Drive.

chrome/browser/chromeos/gdata/gdata_protocol_handler.cc

Index: chrome/browser/chromeos/gdata/gdata_protocol_handler.cc
diff --git a/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc b/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc
index 271f8bc6d82f20301ef07eb294b8cdfb5ceb2c9a..8ded7b4fc5374dd7f8e28b022ebe77f3c22952de 100644
--- a/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc
+++ b/chrome/browser/chromeos/gdata/gdata_protocol_handler.cc
@@ -323,9 +323,24 @@ void GDataURLRequestJob::Kill() {
   weak_ptr_factory_->InvalidateWeakPtrs();
 }
 
+const struct MimeTypeReplacement {

[Greg Spencer (Chromium), 2012/06/20 16:44:56]

Can you move this to the top of the file, under
kInitialDownloadBufferSizeInBytes?

[tudalex(Chromium), 2012/06/20 18:20:30]

Done.

+  const char* original_type;
+  const char* new_type;

[Greg Spencer (Chromium), 2012/06/20 16:44:56]

Can you please split this into a struct definition and a separate declaration of
the const array?  I know it's semantically the same, but it's easier to read.

[tudalex(Chromium), 2012/06/20 18:20:30]

Done.

+} kMimeTypeReplacements[] = {
+    {"message/rfc822","multipart/related"}
+};
+
+std::string FixupMimeType(const std::string& type) {

[Greg Spencer (Chromium), 2012/06/20 16:44:56]

Since this isn't a member of the class here, can you move it to the top of the
anonymous namespace, probably after CancelGDataDownloadOnUIThread (the last
non-member anonymous namespace function).

Typical ordering in a file is:
1) #includes
2) static class member variable declarations
3) anonymous namespace start
4) file-local constants and types
5) file-local functions
6) file-local classes
7) end anonymous namespace
8) class member function definitions

(#2 could also go before #8, I think).

[tudalex(Chromium), 2012/06/20 18:20:30]

Done.

+  for (size_t i = 0; i < arraysize(kMimeTypeReplacements); i++) {
+    if (type == kMimeTypeReplacements[i].original_type)
+      return kMimeTypeReplacements[i].new_type;
+  }
+  return type;
+}
+
 bool GDataURLRequestJob::GetMimeType(std::string* mime_type) const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  mime_type->assign(mime_type_);
+  mime_type->assign(FixupMimeType(mime_type_));
   return !mime_type->empty();
 }