[Offline pages] Fix crashing snapshot controller and reorganize reset code for easier test maintena…

chrome/browser/android/offline_pages/background_loader_offliner.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_ANDROID_OFFLINE_PAGES_BACKGROUND_LOADER_OFFLINER_H_
 #define CHROME_BROWSER_ANDROID_OFFLINE_PAGES_BACKGROUND_LOADER_OFFLINER_H_
 
 #include <memory>
 
 #include "base/android/application_status_listener.h"
@@ skipping 54 matching lines @@
  protected:
   // Called to reset the loader.
   virtual void ResetLoader();
 
  private:
   friend class TestBackgroundLoaderOffliner;
 
   enum SaveState { NONE, SAVING, DELETE_AFTER_SAVE };
   enum PageLoadState { SUCCESS, RETRIABLE, NONRETRIABLE, DELAY_RETRY };
 
+  void ResetState();
+
   // Called when the page has been saved.
   void OnPageSaved(SavePageResult save_result, int64_t offline_id);
 
   // Called to reset internal loader and observer state.
   void ResetState();
 
   // Called to attach 'this' as the observer to the loader.
   void AttachObservers();
 
   // Called when application state has changed.
@@ skipping 49 matching lines @@
 
   // Callback for cancel.
   CancelCallback cancel_callback_;
 
   base::WeakPtrFactory<BackgroundLoaderOffliner> weak_ptr_factory_;
   DISALLOW_COPY_AND_ASSIGN(BackgroundLoaderOffliner);
 };
 
 }  // namespace offline_pages
 #endif  // CHROME_BROWSER_ANDROID_OFFLINE_PAGES_BACKGROUND_LOADER_OFFLINER_H_