Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: net/base/platform_mime_util_linux.cc

Issue 8429034: Upstream: Build net_unittests for Android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: split out unreviewed files Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « net/base/net_util_unittest.cc ('k') | net/base/x509_certificate_openssl.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "net/base/platform_mime_util.h" 5 #include "net/base/platform_mime_util.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "build/build_config.h" 10 #include "build/build_config.h"
11 11
12 #if defined(OS_ANDROID) 12 #if defined(OS_ANDROID)
13 #include "net/android/network_library.h" 13 #include "net/android/network_library.h"
14 #else 14 #else
15 #include "base/nix/mime_util_xdg.h" 15 #include "base/nix/mime_util_xdg.h"
16 #endif 16 #endif
17 17
18 namespace net { 18 namespace net {
19 19
20 #if defined(OS_ANDROID) 20 #if defined(OS_ANDROID)
21 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension( 21 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
22 const FilePath::StringType& ext, std::string* result) const { 22 const FilePath::StringType& ext, std::string* result) const {
23 // TODO(jingzhao): Recover the original implementation once we support JNI.
24 #if 0
23 return android::GetMimeTypeFromExtension(ext, result); 25 return android::GetMimeTypeFromExtension(ext, result);
26 #else
27 NOTIMPLEMENTED();
28 return false;
29 #endif
24 } 30 }
25 #else 31 #else
26 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension( 32 bool PlatformMimeUtil::GetPlatformMimeTypeFromExtension(
27 const FilePath::StringType& ext, std::string* result) const { 33 const FilePath::StringType& ext, std::string* result) const {
28 // TODO(thestig) This is a temporary hack until we can fix this 34 // TODO(thestig): This is a temporary hack until we can fix this
29 // properly in test shell / webkit. 35 // properly in test shell / webkit.
30 // We have to play dumb and not return application/x-perl here 36 // We have to play dumb and not return application/x-perl here
31 // to make the reload-subframe-object layout test happy. 37 // to make the reload-subframe-object layout test happy.
32 if (ext == "pl") 38 if (ext == "pl")
33 return false; 39 return false;
34 40
35 FilePath dummy_path("foo." + ext); 41 FilePath dummy_path("foo." + ext);
36 std::string out = base::nix::GetFileMimeType(dummy_path); 42 std::string out = base::nix::GetFileMimeType(dummy_path);
37 43
38 // GetFileMimeType likes to return application/octet-stream 44 // GetFileMimeType likes to return application/octet-stream
(...skipping 53 matching lines...) Expand 10 before | Expand all | Expand 10 after
92 // 98 //
93 // If we wanted to do this properly, we would read the mime.cache file which 99 // If we wanted to do this properly, we would read the mime.cache file which
94 // has a section where they assign a glob (*.gif) to a mimetype 100 // has a section where they assign a glob (*.gif) to a mimetype
95 // (image/gif). We look up the "heaviest" glob for a certain mime type and 101 // (image/gif). We look up the "heaviest" glob for a certain mime type and
96 // then then try to chop off "*.". 102 // then then try to chop off "*.".
97 103
98 return false; 104 return false;
99 } 105 }
100 106
101 } // namespace net 107 } // namespace net
OLDNEW
« no previous file with comments | « net/base/net_util_unittest.cc ('k') | net/base/x509_certificate_openssl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698