[Sync] Remove backend unrecoverable error handler

sync/syncable/syncable_unittest.cc

 // 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.
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
@@ skipping 67 matching lines @@
     return OnDiskDirectoryBackingStore::SaveChanges(snapshot);
   }
 }
 
 // A directory whose Save() function can be set to always fail.
 class TestDirectory : public Directory {
  public:
   // A factory function used to work around some initialization order issues.
   static TestDirectory* Create(
       Encryptor *encryptor,
-      UnrecoverableErrorHandler *handler,
+      const WeakHandle<UnrecoverableErrorHandler>& handler,
       const std::string& dir_name,
       const base::FilePath& backing_filepath);
 
   ~TestDirectory() override;
 
   void StartFailingSaveChanges() {
     backing_store_->StartFailingSaveChanges();
   }
 
  private:
   TestDirectory(Encryptor* encryptor,
-                UnrecoverableErrorHandler* handler,
+                const WeakHandle<UnrecoverableErrorHandler>& handler,
                 TestBackingStore* backing_store);
 
   TestBackingStore* backing_store_;
 };
 
 TestDirectory* TestDirectory::Create(
     Encryptor *encryptor,
-    UnrecoverableErrorHandler *handler,
+    const WeakHandle<UnrecoverableErrorHandler>& handler,
     const std::string& dir_name,
     const base::FilePath& backing_filepath) {
   TestBackingStore* backing_store =
       new TestBackingStore(dir_name, backing_filepath);
   return new TestDirectory(encryptor, handler, backing_store);
 }
 
-TestDirectory::TestDirectory(Encryptor* encryptor,
-                             UnrecoverableErrorHandler* handler,
-                             TestBackingStore* backing_store)
+TestDirectory::TestDirectory(
+    Encryptor* encryptor,
+    const WeakHandle<UnrecoverableErrorHandler>& handler,
+    TestBackingStore* backing_store)
     : Directory(backing_store, handler, base::Closure(), NULL, NULL),
-      backing_store_(backing_store) {
-}
+      backing_store_(backing_store) {}
 
 TestDirectory::~TestDirectory() { }
 
 TEST(OnDiskSyncableDirectory, FailInitialWrite) {
   base::MessageLoop message_loop;
   FakeEncryptor encryptor;
   TestUnrecoverableErrorHandler handler;
   base::ScopedTempDir temp_dir;
   ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
   base::FilePath file_path = temp_dir.path().Append(
       FILE_PATH_LITERAL("Test.sqlite3"));
   std::string name = "user@x.com";
   NullDirectoryChangeDelegate delegate;
 
-  scoped_ptr<TestDirectory> test_dir(
-      TestDirectory::Create(&encryptor, &handler, name, file_path));
+  scoped_ptr<TestDirectory> test_dir(TestDirectory::Create(
+      &encryptor, MakeWeakHandle(handler.GetWeakPtr()), name, file_path));
 
   test_dir->StartFailingSaveChanges();
   ASSERT_EQ(FAILED_INITIAL_WRITE, test_dir->Open(name, &delegate,
                                                  NullTransactionObserver()));
 }
 
 // A variant of SyncableDirectoryTest that uses a real sqlite database.
 class OnDiskSyncableDirectoryTest : public SyncableDirectoryTest {
  protected:
   // SetUp() is called before each test case is run.
@@ skipping 11 matching lines @@
     // This also closes file handles.
     dir()->SaveChanges();
     dir().reset();
     base::DeleteFile(file_path_, true);
     SyncableDirectoryTest::TearDown();
   }
 
   // Creates a new directory.  Deletes the old directory, if it exists.
   void CreateDirectory() {
     test_directory_ = TestDirectory::Create(
-        encryptor(), unrecoverable_error_handler(), kDirectoryName, file_path_);
+        encryptor(),
+        MakeWeakHandle(unrecoverable_error_handler()->GetWeakPtr()),
+        kDirectoryName, file_path_);
     dir().reset(test_directory_);
     ASSERT_TRUE(dir().get());
     ASSERT_EQ(OPENED,
               dir()->Open(kDirectoryName,
                           directory_change_delegate(),
                           NullTransactionObserver()));
     ASSERT_TRUE(dir()->good());
   }
 
   void SaveAndReloadDir() {
@@ skipping 157 matching lines @@
     specifics.mutable_bookmark()->set_favicon("PNG");
     specifics.mutable_bookmark()->set_url("http://nowhere");
     create.PutSpecifics(specifics);
     update.PutServerSpecifics(specifics);
     create_pre_save = create.GetKernelCopy();
     update_pre_save = update.GetKernelCopy();
     create_id = create.GetId();
   }
 
   dir()->SaveChanges();
-  dir().reset(new Directory(
-      new OnDiskDirectoryBackingStore(kDirectoryName, file_path_),
-      unrecoverable_error_handler(), base::Closure(), NULL, NULL));
+  dir().reset(
+      new Directory(new OnDiskDirectoryBackingStore(kDirectoryName, file_path_),
+                    MakeWeakHandle(unrecoverable_error_handler()->GetWeakPtr()),
+                    base::Closure(), NULL, NULL));
 
   ASSERT_TRUE(dir().get());
   ASSERT_EQ(OPENED,
             dir()->Open(kDirectoryName,
                         directory_change_delegate(),
                         NullTransactionObserver()));
   ASSERT_TRUE(dir()->good());
 
   {
     ReadTransaction trans(FROM_HERE, dir().get());
@@ skipping 192 matching lines @@
   FakeEncryptor encryptor_;
   TestUnrecoverableErrorHandler handler_;
   NullDirectoryChangeDelegate delegate_;
 };
 
 TEST_F(SyncableDirectoryManagement, TestFileRelease) {
   base::FilePath path =
       temp_dir_.path().Append(Directory::kSyncDatabaseFilename);
 
   {
-    Directory dir(new OnDiskDirectoryBackingStore("ScopeTest", path), &handler_,
-                  base::Closure(), NULL, NULL);
+    Directory dir(new OnDiskDirectoryBackingStore("ScopeTest", path),
+                  MakeWeakHandle(handler_.GetWeakPtr()), base::Closure(), NULL,
+                  NULL);
     DirOpenResult result =
         dir.Open("ScopeTest", &delegate_, NullTransactionObserver());
     ASSERT_EQ(result, OPENED);
   }
 
   // Destroying the directory should have released the backing database file.
   ASSERT_TRUE(base::DeleteFile(path, true));
 }
 
 class SyncableClientTagTest : public SyncableDirectoryTest {
@@ skipping 86 matching lines @@
 TEST_F(SyncableClientTagTest, TestClientTagIndexDuplicateServer) {
   EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false));
   EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true));
 }
 
 }  // namespace syncable
 }  // namespace syncer