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

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

Issue 274193004: Restore base::ThreadRestrictions::ScopedAllowIO to see if it fixes linux bot failures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 months 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 | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/filename_util.h" 5 #include "net/base/filename_util.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 153 matching lines...) Expand 10 before | Expand all | Expand 10 after
164 bool ignore_extension, 164 bool ignore_extension,
165 base::FilePath* file_name) { 165 base::FilePath* file_name) {
166 // See if our file name already contains an extension. 166 // See if our file name already contains an extension.
167 base::FilePath::StringType extension = file_name->Extension(); 167 base::FilePath::StringType extension = file_name->Extension();
168 if (!extension.empty()) 168 if (!extension.empty())
169 extension.erase(extension.begin()); // Erase preceding '.'. 169 extension.erase(extension.begin()); // Erase preceding '.'.
170 170
171 if ((ignore_extension || extension.empty()) && !mime_type.empty()) { 171 if ((ignore_extension || extension.empty()) && !mime_type.empty()) {
172 base::FilePath::StringType preferred_mime_extension; 172 base::FilePath::StringType preferred_mime_extension;
173 std::vector<base::FilePath::StringType> all_mime_extensions; 173 std::vector<base::FilePath::StringType> all_mime_extensions;
174 // The GetPreferredExtensionForMimeType call will end up going to disk. Do
175 // this on another thread to avoid slowing the IO thread.
176 // http://crbug.com/61827
177 // TODO(asanka): Remove this ScopedAllowIO once all callers have switched
178 // over to IO safe threads.
179 base::ThreadRestrictions::ScopedAllowIO allow_io;
174 net::GetPreferredExtensionForMimeType(mime_type, &preferred_mime_extension); 180 net::GetPreferredExtensionForMimeType(mime_type, &preferred_mime_extension);
175 net::GetExtensionsForMimeType(mime_type, &all_mime_extensions); 181 net::GetExtensionsForMimeType(mime_type, &all_mime_extensions);
176 // If the existing extension is in the list of valid extensions for the 182 // If the existing extension is in the list of valid extensions for the
177 // given type, use it. This avoids doing things like pointlessly renaming 183 // given type, use it. This avoids doing things like pointlessly renaming
178 // "foo.jpg" to "foo.jpeg". 184 // "foo.jpg" to "foo.jpeg".
179 if (std::find(all_mime_extensions.begin(), 185 if (std::find(all_mime_extensions.begin(),
180 all_mime_extensions.end(), 186 all_mime_extensions.end(),
181 extension) != all_mime_extensions.end()) { 187 extension) != all_mime_extensions.end()) {
182 // leave |extension| alone 188 // leave |extension| alone
183 } else if (!preferred_mime_extension.empty()) { 189 } else if (!preferred_mime_extension.empty()) {
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 base::FilePath generated_name( 315 base::FilePath generated_name(
310 base::SysWideToNativeMB(base::UTF16ToWide(file_name))); 316 base::SysWideToNativeMB(base::UTF16ToWide(file_name)));
311 #endif 317 #endif
312 318
313 DCHECK(!generated_name.empty()); 319 DCHECK(!generated_name.empty());
314 320
315 return generated_name; 321 return generated_name;
316 } 322 }
317 323
318 } // namespace net 324 } // namespace net
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698