[Sync] Make DirectoryBackingStore's db_ private.

sync/syncable/directory_backing_store.h

 // Copyright 2012 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 SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 #define SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 26 matching lines @@
 // The DirectoryBackingStore will own an sqlite lock on its database for most of
 // its lifetime.  You must not have two DirectoryBackingStore objects accessing
 // the database simultaneously.  Because the lock exists at the database level,
 // not even two separate browser instances would be able to acquire it
 // simultaneously.
 //
 // This class is abstract so that we can extend it in interesting ways for use
 // in tests.  The concrete class used in non-test scenarios is
 // OnDiskDirectoryBackingStore.
 class SYNC_EXPORT_PRIVATE DirectoryBackingStore : public base::NonThreadSafe {
+  friend class TestDirectoryBackingStore;

[maniscalco, 2015/04/15 18:10:43]

TestDirectoryBackingStore is friend so it can .release() db_.  It may be
possible to change the way TDBS is use in tests to eliminate this friend, but I
think that's beyond the scope of this patch.

[Nicolas Zea, 2015/04/16 15:56:33]

nit: these should all be within the private: section below

[maniscalco, 2015/04/16 16:03:45]

Done.

   friend class DirectoryBackingStoreTest;
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest,
                            IncreaseDatabasePageSizeFrom4KTo32K);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest,
                            CatastrophicErrorHandler_KeptAcrossReset);
   FRIEND_TEST_ALL_PREFIXES(DirectoryBackingStoreTest,
                            CatastrophicErrorHandler_Invocation);
 
  public:
   explicit DirectoryBackingStore(const std::string& dir_name);
@@ skipping 42 matching lines @@
   // already a handler, the existing handler is overwritten with
   // |catastrophic_error_handler|.
   virtual void SetCatastrophicErrorHandler(
       const base::Closure& catastrophic_error_handler);
 
  protected:
   // For test classes.
   DirectoryBackingStore(const std::string& dir_name,
                         sql::Connection* connection);
 
+  // An accessor for the underlying sql::Connection. Avoid using outside of
+  // tests.
+  sql::Connection* db();
+
+  // Return true if the DB is open.
+  bool IsOpen() const;
+
+  // Open the DB at |path|.
+  // Return true on success, false on failure.
+  bool Open(const base::FilePath& path);
+
+  // Open an in memory DB.
+  // Return true on success, false on failure.
+  bool OpenInMemory();
+
   // General Directory initialization and load helpers.
   bool InitializeTables();
   bool CreateTables();
 
   // Create 'share_info' or 'temp_share_info' depending on value of
   // is_temporary. Returns an sqlite
   bool CreateShareInfoTable(bool is_temporary);
 
   bool CreateShareInfoTableVersion71(bool is_temporary);
   // Create 'metas' or 'temp_metas' depending on value of is_temporary. Also
@@ skipping 87 matching lines @@
   bool MigrateVersion86To87();
   bool MigrateVersion87To88();
   bool MigrateVersion88To89();
 
   // Accessor for needs_column_refresh_.  Used in tests.
   bool needs_column_refresh() const;
 
   // Destroys the existing Connection and creates a new one.
   void ResetAndCreateConnection();
 
-  scoped_ptr<sql::Connection> db_;
-
  private:
   bool Vacuum();
   bool IncreasePageSizeTo32K();
   bool GetDatabasePageSize(int* page_size);
 
   // Prepares |save_statement| for saving entries in |table|.
   void PrepareSaveEntryStatement(EntryTable table,
                                  sql::Statement* save_statement);
 
   const std::string dir_name_;
   const int database_page_size_;
+
+  scoped_ptr<sql::Connection> db_;
   sql::Statement save_meta_statement_;
   sql::Statement save_delete_journal_statement_;
 
   // Set to true if migration left some old columns around that need to be
   // discarded.
   bool needs_column_refresh_;
 
   // We keep a copy of the Closure so we reinstall it when the underlying
   // sql::Connection is destroyed/recreated.
   base::Closure catastrophic_error_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(DirectoryBackingStore);
 };
 
 }  // namespace syncable
 }  // namespace syncer
 
 #endif  // SYNC_SYNCABLE_DIRECTORY_BACKING_STORE_H_