[Offline pages]: Move logic for whether to consider the DocumentAvailableInMainFrame signal to the …

chrome/browser/android/offline_pages/background_loader_offliner.cc

Index: chrome/browser/android/offline_pages/background_loader_offliner.cc
diff --git a/chrome/browser/android/offline_pages/background_loader_offliner.cc b/chrome/browser/android/offline_pages/background_loader_offliner.cc
index 60f8c50e8eb6e661da69c3660ac1af31d9ff11b2..e16f9f44500a668a79aff70af809a5a45536b6b3 100644
--- a/chrome/browser/android/offline_pages/background_loader_offliner.cc
+++ b/chrome/browser/android/offline_pages/background_loader_offliner.cc
@@ -22,8 +22,6 @@
 namespace offline_pages {
 
 namespace {
-const long kOfflinePageDelayMs = 2000;
-const long kOfflineDomContentLoadedMs = 25000;
 
 class OfflinerData : public content::WebContentsUserData<OfflinerData> {
  public:
@@ -76,7 +74,6 @@ BackgroundLoaderOffliner::BackgroundLoaderOffliner(
       is_low_end_device_(base::SysInfo::IsLowEndDevice()),
       save_state_(NONE),
       page_load_state_(SUCCESS),
-      page_delay_ms_(kOfflinePageDelayMs),
       network_bytes_(0LL),
       weak_ptr_factory_(this) {
   DCHECK(offline_page_model_);
@@ -170,9 +167,8 @@ bool BackgroundLoaderOffliner::LoadAndSave(
   // Load page attempt.
   loader_.get()->LoadPage(request.url());
 
-  snapshot_controller_.reset(
-      new SnapshotController(base::ThreadTaskRunnerHandle::Get(), this,
-                             kOfflineDomContentLoadedMs, page_delay_ms_));
+  snapshot_controller_.reset(SnapshotController::CreateForBackgroundOfflining(
+      base::ThreadTaskRunnerHandle::Get(), this));
 
   return true;
 }
@@ -277,8 +273,9 @@ void BackgroundLoaderOffliner::DidFinishNavigation(
   }
 }
 
-void BackgroundLoaderOffliner::SetPageDelayForTest(long delay_ms) {
-  page_delay_ms_ = delay_ms;
+void BackgroundLoaderOffliner::SetSnapshotControllerForTest(

[fgorski, 2017/04/21 16:05:10]

+1 one to the use of injection that way! I think this provides for a cleaner
experience, since now you can create the controller in test.

However, because your are taking ownership inside of BLO, you should pass by
unique_ptr<>. Please fix.

This is very good otherwise.

[chili, 2017/04/24 20:34:14]

Done.

+    SnapshotController* controller) {
+  snapshot_controller_.reset(controller);
 }
 
 void BackgroundLoaderOffliner::OnNetworkBytesChanged(int64_t bytes) {