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

Side by Side Diff: chrome/browser/download/download_test_observer.h

Issue 9570005: Added callback to DownloadUrl() so we can find download failures. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merged with trunk Created 8 years, 9 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
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_ 5 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
6 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_ 6 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <vector>
10 11
11 #include "base/basictypes.h" 12 #include "base/basictypes.h"
12 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
13 #include "content/public/browser/download_item.h" 14 #include "content/public/browser/download_item.h"
14 #include "content/public/browser/download_manager.h" 15 #include "content/public/browser/download_manager.h"
16 #include "net/base/net_errors.h"
15 17
16 // Detects changes to the downloads after construction. 18 // Detects changes to the downloads after construction.
17 // Finishes when one of the following happens: 19 // Finishes when one of the following happens:
18 // - A specified number of downloads change to a terminal state (defined 20 // - A specified number of downloads change to a terminal state (defined
19 // in derived classes). 21 // in derived classes).
20 // - Specific events, such as a select file dialog. 22 // - Specific events, such as a select file dialog.
21 // Callers may either probe for the finished state, or wait on it. 23 // Callers may either probe for the finished state, or wait on it.
22 // 24 //
23 // TODO(rdsmith): Detect manager going down, remove pointer to 25 // TODO(rdsmith): Detect manager going down, remove pointer to
24 // DownloadManager, transition to finished. (For right now we 26 // DownloadManager, transition to finished. (For right now we
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 234
233 void PingIOThread(int cycle); 235 void PingIOThread(int cycle);
234 236
235 content::DownloadManager* download_manager_; 237 content::DownloadManager* download_manager_;
236 DownloadSet downloads_observed_; 238 DownloadSet downloads_observed_;
237 bool waiting_for_zero_inprogress_; 239 bool waiting_for_zero_inprogress_;
238 240
239 DISALLOW_COPY_AND_ASSIGN(DownloadTestFlushObserver); 241 DISALLOW_COPY_AND_ASSIGN(DownloadTestFlushObserver);
240 }; 242 };
241 243
244 // Waits for a callback indicating that the DownloadItem is about to be created,
245 // or that an error occurred and it won't be created.
246 class DownloadTestItemCreationObserver
247 : public base::RefCountedThreadSafe<DownloadTestItemCreationObserver> {
248 public:
249 DownloadTestItemCreationObserver();
250
251 void WaitForDownloadItemCreation();
252
253 content::DownloadId download_id() const { return download_id_; }
254 net::Error error() const { return error_; }
255 bool started() const { return called_back_count_ > 0; }
256 bool succeeded() const { return started() && (error_ == net::OK); }
257
258 const content::DownloadManager::OnStartedCallback callback();
259
260 private:
261 friend class base::RefCountedThreadSafe<DownloadTestItemCreationObserver>;
262
263 ~DownloadTestItemCreationObserver();
264
265 void DownloadItemCreationCallback(content::DownloadId download_id,
266 net::Error error);
267
268 // The download creation information we received.
269 content::DownloadId download_id_;
270
271 net::Error error_;
272
273 // Count of callbacks.
274 size_t called_back_count_;
275
276 // We are in the message loop.
277 bool waiting_;
278
279 DISALLOW_COPY_AND_ASSIGN(DownloadTestItemCreationObserver);
280 };
281
242 #endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_ 282 #endif // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_TEST_OBSERVER_H_
OLDNEW
« no previous file with comments | « chrome/browser/download/download_browsertest.cc ('k') | chrome/browser/download/download_test_observer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698