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

Side by Side Diff: content/browser/download/download_file.cc

Issue 8399001: Use a DownloadRequestHandle pointer in construction to allow mocking for tests. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to TOT. 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
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 "content/browser/download/download_file.h" 5 #include "content/browser/download/download_file.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/stringprintf.h" 10 #include "base/stringprintf.h"
11 #include "content/browser/download/download_create_info.h" 11 #include "content/browser/download/download_create_info.h"
12 #include "content/browser/download/download_manager.h" 12 #include "content/browser/download/download_manager.h"
13 #include "content/public/browser/browser_thread.h" 13 #include "content/public/browser/browser_thread.h"
14 14
15 namespace { 15 namespace {
16 16
17 // The maximum number of 'uniquified' files we will try to create. 17 // The maximum number of 'uniquified' files we will try to create.
18 // This is used when the filename we're trying to download is already in use, 18 // This is used when the filename we're trying to download is already in use,
19 // so we create a new unique filename by appending " (nnn)" before the 19 // so we create a new unique filename by appending " (nnn)" before the
20 // extension, where 1 <= nnn <= kMaxUniqueFiles. 20 // extension, where 1 <= nnn <= kMaxUniqueFiles.
21 // Also used by code that cleans up said files. 21 // Also used by code that cleans up said files.
22 static const int kMaxUniqueFiles = 100; 22 static const int kMaxUniqueFiles = 100;
23 23
24 } 24 }
25 25
26 DownloadFile::DownloadFile(const DownloadCreateInfo* info, 26 DownloadFile::DownloadFile(const DownloadCreateInfo* info,
27 const DownloadRequestHandle& request_handle, 27 DownloadRequestHandleInterface* request_handle,
28 DownloadManager* download_manager) 28 DownloadManager* download_manager)
29 : BaseFile(info->save_info.file_path, 29 : BaseFile(info->save_info.file_path,
30 info->url(), 30 info->url(),
31 info->referrer_url, 31 info->referrer_url,
32 info->received_bytes, 32 info->received_bytes,
33 info->save_info.file_stream), 33 info->save_info.file_stream),
34 id_(info->download_id), 34 id_(info->download_id),
35 request_handle_(request_handle), 35 request_handle_(request_handle),
36 download_manager_(download_manager) { 36 download_manager_(download_manager) {
37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 37 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
38 } 38 }
39 39
40 DownloadFile::~DownloadFile() { 40 DownloadFile::~DownloadFile() {
41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 41 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
42 } 42 }
43 43
44 void DownloadFile::CancelDownloadRequest() { 44 void DownloadFile::CancelDownloadRequest() {
45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 45 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
46 request_handle_.CancelRequest(); 46 request_handle_->CancelRequest();
47 } 47 }
48 48
49 DownloadManager* DownloadFile::GetDownloadManager() { 49 DownloadManager* DownloadFile::GetDownloadManager() {
50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 50 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
51 return download_manager_.get(); 51 return download_manager_.get();
52 } 52 }
53 53
54 std::string DownloadFile::DebugString() const { 54 std::string DownloadFile::DebugString() const {
55 return base::StringPrintf("{" 55 return base::StringPrintf("{"
56 " id_ = " "%d" 56 " id_ = " "%d"
57 " request_handle = %s" 57 " request_handle = %s"
58 " Base File = %s" 58 " Base File = %s"
59 " }", 59 " }",
60 id_.local(), 60 id_.local(),
61 request_handle_.DebugString().c_str(), 61 request_handle_->DebugString().c_str(),
62 BaseFile::DebugString().c_str()); 62 BaseFile::DebugString().c_str());
63 } 63 }
64 64
65 void DownloadFile::AppendNumberToPath(FilePath* path, int number) { 65 void DownloadFile::AppendNumberToPath(FilePath* path, int number) {
66 *path = path->InsertBeforeExtensionASCII(StringPrintf(" (%d)", number)); 66 *path = path->InsertBeforeExtensionASCII(StringPrintf(" (%d)", number));
67 } 67 }
68 68
69 int DownloadFile::GetUniquePathNumber(const FilePath& path) { 69 int DownloadFile::GetUniquePathNumber(const FilePath& path) {
70 if (!file_util::PathExists(path)) 70 if (!file_util::PathExists(path))
71 return 0; 71 return 0;
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 new_path = FilePath(path); 104 new_path = FilePath(path);
105 AppendNumberToPath(&new_path, count); 105 AppendNumberToPath(&new_path, count);
106 106
107 if (!file_util::PathExists(new_path) && 107 if (!file_util::PathExists(new_path) &&
108 !file_util::PathExists(AppendSuffixToPath(new_path, suffix))) 108 !file_util::PathExists(AppendSuffixToPath(new_path, suffix)))
109 return count; 109 return count;
110 } 110 }
111 111
112 return -1; 112 return -1;
113 } 113 }
OLDNEW
« no previous file with comments | « content/browser/download/download_file.h ('k') | content/browser/download/download_file_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698