Updates to PrerenderingOffliner and PrerenderingLoader interfaces to push PrerenderManager knowledge

chrome/browser/android/offline_pages/prerendering_offliner.h

Index: chrome/browser/android/offline_pages/prerendering_offliner.h
diff --git a/chrome/browser/android/offline_pages/prerendering_offliner.h b/chrome/browser/android/offline_pages/prerendering_offliner.h
index a9851429bdd1a601cc2b4678b50159b0260e3e5b..c783e0b96abb2857180d66c98f42c83883361f04 100644
--- a/chrome/browser/android/offline_pages/prerendering_offliner.h
+++ b/chrome/browser/android/offline_pages/prerendering_offliner.h
@@ -5,13 +5,15 @@
 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_PRERENDERING_OFFLINER_H_
 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_PRERENDERING_OFFLINER_H_
 
+#include <memory>
+
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/android/offline_pages/prerendering_loader.h"
 #include "components/offline_pages/background/offliner.h"
 #include "components/offline_pages/offline_page_model.h"
 
-class PrerenderManager;
-
 namespace content {
+class BrowserContext;
 class WebContents;
 }  // namespace content
 
@@ -24,8 +26,8 @@ class OfflinerPolicy;
 // the OfflinePageModel to save it.
 class PrerenderingOffliner : public Offliner {
  public:
-  PrerenderingOffliner(const OfflinerPolicy* policy,
-                       PrerenderManager* prerender_manager,
+  PrerenderingOffliner(content::BrowserContext* browser_context,

[Pete Williamson, 2016/05/09 16:49:38]

We could probably make content::BrowserContext const here.

[dougarnett, 2016/05/09 17:42:03]

I don't think so as we want to get Profile from it and this doesn't take const:
https://code.google.com/p/chromium/codesearch#chromium/src/chrome/browser/pro...

Also, the PrerenderManager ctor does not take const Profile.

+                       const OfflinerPolicy* policy,
                        OfflinePageModel* offline_page_model);
   ~PrerenderingOffliner() override;
 
@@ -34,8 +36,23 @@ class PrerenderingOffliner : public Offliner {
 
   void Cancel() override;
 
+ protected:
+  // Constructor for injecting PrerenderingLoader for testing.
+  PrerenderingOffliner(content::BrowserContext* browser_context,

[Pete Williamson, 2016/05/09 16:49:38]

and here...

[dougarnett, 2016/05/09 17:42:04]

ditto

+                       const OfflinerPolicy* policy,
+                       OfflinePageModel* offline_page_model,
+                       PrerenderingLoader* loader);
+
  private:
+  void OnLoadPageDone(Offliner::CompletionStatus load_status,

[Pete Williamson, 2016/05/09 16:49:38]

load_status can also likely be const.  Might be a good idea to check in other
places too, and make const whatever we can.

[dougarnett, 2016/05/09 17:42:03]

Done.

[fgorski, 2016/05/09 20:38:32]

It is an enum, hence no need to const it.

+                      content::WebContents* contents);
+
+  // Not owned.
+  OfflinePageModel* offline_page_model_;
   std::unique_ptr<PrerenderingLoader> loader_;
+  base::WeakPtrFactory<PrerenderingOffliner> weak_ptr_factory_;
+
+  DISALLOW_COPY_AND_ASSIGN(PrerenderingOffliner);
 };
 
 }  // namespace offline_pages