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

chrome/browser/chromeos/gdata/gdata_protocol_handler.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 "chrome/browser/chromeos/gdata/gdata_protocol_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 305 matching lines @@
         BrowserThread::UI,
         FROM_HERE,
         base::Bind(&CancelGDataDownloadOnUIThread,
                    gdata_file_path_));
   }
 
   net::URLRequestJob::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();
 }
 
 void GDataURLRequestJob::GetResponseInfo(net::HttpResponseInfo* info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   if (response_info_.get())
     *info = *response_info_;
 }
 
 int GDataURLRequestJob::GetResponseCode() const {
@@ skipping 564 matching lines @@
 GDataProtocolHandler::~GDataProtocolHandler() {
 }
 
 net::URLRequestJob* GDataProtocolHandler::MaybeCreateJob(
     net::URLRequest* request) const {
   DVLOG(1) << "Handling url: " << request->url().spec();
   return new GDataURLRequestJob(request);
 }
 
 }  // namespace gdata