Chromium Code Reviews| Index: components/offline_pages/core/snapshot_controller.cc |
| diff --git a/components/offline_pages/core/snapshot_controller.cc b/components/offline_pages/core/snapshot_controller.cc |
| index 4f7d3370e09127f3ca2bbb87bd7a9e2e7a3b544d..dd287aac51cf643c48896c4b2eb511e3d9e85f3c 100644 |
| --- a/components/offline_pages/core/snapshot_controller.cc |
| +++ b/components/offline_pages/core/snapshot_controller.cc |
| @@ -8,16 +8,20 @@ |
| #include "base/location.h" |
| #include "base/logging.h" |
| #include "base/time/time.h" |
| +#include "components/offline_pages/core/offline_page_feature.h" |
| namespace { |
| // Default delay, in milliseconds, between the main document parsed event and |
| // snapshot. Note: this snapshot might not occur if the OnLoad event and |
| // OnLoad delay elapses first to trigger a final snapshot. |
| -const size_t kDefaultDelayAfterDocumentAvailableMs = 7000; |
| +const int64_t kDefaultDelayAfterDocumentAvailableMs = 7000; |
| // Default delay, in milliseconds, between the main document OnLoad event and |
| // snapshot. |
| -const size_t kDelayAfterDocumentOnLoadCompletedMs = 1000; |
| +const int64_t kDelayAfterDocumentOnLoadCompletedMs = 1000; |
| + |
| +// Delay for testing to keep polling times reasonable. |
| +const int64_t kDelayForTests = 10; |
| } // namespace |
| @@ -25,27 +29,29 @@ namespace offline_pages { |
| SnapshotController::SnapshotController( |
| const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| - SnapshotController::Client* client) |
| - : task_runner_(task_runner), |
| - client_(client), |
| - state_(State::READY), |
| - delay_after_document_available_ms_(kDefaultDelayAfterDocumentAvailableMs), |
| - delay_after_document_on_load_completed_ms_( |
| - kDelayAfterDocumentOnLoadCompletedMs), |
| - weak_ptr_factory_(this) {} |
| - |
| -SnapshotController::SnapshotController( |
| - const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| SnapshotController::Client* client, |
| - size_t delay_after_document_available_ms, |
| - size_t delay_after_document_on_load_completed_ms) |
| + int64_t delay_after_document_available_ms, |
| + int64_t delay_after_document_on_load_completed_ms) |
| : task_runner_(task_runner), |
| client_(client), |
| state_(State::READY), |
| delay_after_document_available_ms_(delay_after_document_available_ms), |
| delay_after_document_on_load_completed_ms_( |
| delay_after_document_on_load_completed_ms), |
| - weak_ptr_factory_(this) {} |
| + weak_ptr_factory_(this) { |
| + if (offline_pages::ShouldUseTestingSnapshotDelay()) { |
|
Dmitry Titov
2017/01/27 03:10:25
Instead of adding a flag modifying behavior for te
dewittj
2017/01/30 17:32:37
That sounds like a lot of plumbing for this test.
|
| + delay_after_document_available_ms_ = kDelayForTests; |
| + delay_after_document_on_load_completed_ms_ = kDelayForTests; |
| + } |
| +} |
| + |
| +SnapshotController::SnapshotController( |
| + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, |
| + SnapshotController::Client* client) |
| + : SnapshotController(task_runner, |
| + client, |
| + kDefaultDelayAfterDocumentAvailableMs, |
| + kDelayAfterDocumentOnLoadCompletedMs) {} |
| SnapshotController::~SnapshotController() {} |
| @@ -101,11 +107,11 @@ void SnapshotController::MaybeStartSnapshotThenStop() { |
| Stop(); |
| } |
| -size_t SnapshotController::GetDelayAfterDocumentAvailableForTest() { |
| +int64_t SnapshotController::GetDelayAfterDocumentAvailableForTest() { |
| return delay_after_document_available_ms_; |
| } |
| -size_t SnapshotController::GetDelayAfterDocumentOnLoadCompletedForTest() { |
| +int64_t SnapshotController::GetDelayAfterDocumentOnLoadCompletedForTest() { |
| return delay_after_document_on_load_completed_ms_; |
| } |