[Offline pages] OPM SQL store: moving load to constructor, updating read to GetOfflinePages

components/offline_pages/offline_page_metadata_store.h

 // Copyright 2015 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 COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_METADATA_STORE_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_METADATA_STORE_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 18 matching lines @@
   enum LoadStatus {
     LOAD_SUCCEEDED,
     STORE_INIT_FAILED,
     STORE_LOAD_FAILED,
     DATA_PARSING_FAILED,
 
     // NOTE: always keep this entry at the end.
     LOAD_STATUS_COUNT
   };
 
+  // Current store state. When LOADED, the store is operational. When
+  // initialization or reset fails, it is reflected appropriately.
+  enum StoreState {
+    NOT_LOADED,
+    LOADED,
+    FAILED_INITIALIZATION,

[Dmitry Titov, 2016/09/12 18:05:29]

These 2 'state' enums (LoadStatus and StoreState) are very confusing since they
deliver similar information, especially in the code where they are used (w/o
type names since they are not "enum class").

Can this be a single state? Or maybe LoadStatus may loose some duplicate values
(STORE_INIT_FAILED for example) 

[fgorski, 2016/09/12 21:07:42]

TODO added. You are correct and this enum is meant to replace the one above.

+    FAILED_RESET,
+  };
+
   typedef base::Callback<void(LoadStatus, const std::vector<OfflinePageItem>&)>
       LoadCallback;
   typedef base::Callback<void(bool)> UpdateCallback;
   typedef base::Callback<void(bool)> ResetCallback;
 
   OfflinePageMetadataStore();
   virtual ~OfflinePageMetadataStore();
 
   // Get all of the offline pages from the store.
-  virtual void Load(const LoadCallback& callback) = 0;
+  virtual void GetOfflinePages(const LoadCallback& callback) = 0;
 
   // Asynchronously adds or updates offline page metadata to the store.
   // Result of the update is passed in callback.
   virtual void AddOrUpdateOfflinePage(const OfflinePageItem& offline_page,
                                       const UpdateCallback& callback) = 0;
 
   // Asynchronously removes offline page metadata from the store.
   // Result of the update is passed in callback.
   virtual void RemoveOfflinePages(const std::vector<int64_t>& offline_ids,
                                   const UpdateCallback& callback) = 0;
 
   // Resets the store.
   virtual void Reset(const ResetCallback& callback) = 0;
+
+  // Gets the store state.
+  virtual StoreState state() const = 0;
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_METADATA_STORE_H_