Fix the issue that client id is not saved when upgrading the offline metadata store

components/offline_pages/offline_page_metadata_store_impl.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_IMPL_H_
 #define COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_METADATA_STORE_IMPL_H_
 
 #include <stdint.h>
 
 #include <vector>
@@ skipping 29 matching lines @@
 
   // OfflinePageMetadataStore implementation:
   void Load(const LoadCallback& callback) override;
   void AddOrUpdateOfflinePage(const OfflinePageItem& offline_page_record,
                               const UpdateCallback& callback) override;
   void RemoveOfflinePages(const std::vector<int64_t>& offline_ids,
                           const UpdateCallback& callback) override;
   void Reset(const ResetCallback& callback) override;
 
  private:
+  friend class OfflinePageMetadataStoreImplTest;
+
   void LoadContinuation(const LoadCallback& callback, bool success);
   void LoadDone(const LoadCallback& callback,
                 bool success,
                 scoped_ptr<std::vector<OfflinePageEntry>> entries);
   void NotifyLoadResult(const LoadCallback& callback,
                         LoadStatus status,
                         const std::vector<OfflinePageItem>& result);
 
   // Implements the update.
   void UpdateEntries(
@@ skipping 14 matching lines @@
                           LoadStatus status,
                           const std::vector<OfflinePageItem>& result,
                           bool success);
 
   scoped_refptr<base::SequencedTaskRunner> background_task_runner_;
   base::FilePath database_dir_;
   scoped_ptr<leveldb_proto::ProtoDatabase<OfflinePageEntry>> database_;
 
   base::WeakPtrFactory<OfflinePageMetadataStoreImpl> weak_ptr_factory_;
 
-  FRIEND_TEST_ALL_PREFIXES(OfflinePageMetadataStoreImplTest,
-                           LoadCorruptedStore);
-  FRIEND_TEST_ALL_PREFIXES(OfflinePageMetadataStoreImplTest,
-                           LoadTotallyCorruptedStore);
-
   DISALLOW_COPY_AND_ASSIGN(OfflinePageMetadataStoreImpl);
 };
 
 }  // namespace offline_pages
 
 #endif  // COMPONENTS_OFFLINE_PAGES_OFFLINE_PAGE_METADATA_STORE_IMPL_H_