[Sync] Eliminate friends from Directory by exposing kernel via accessor

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 543 matching lines @@
   base::ScopedTempDir temp_dir_;
   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_,
-                NULL,
-                NULL,
-                NULL);
-  DirOpenResult result =
-      dir.Open("ScopeTest", &delegate_, NullTransactionObserver());
-  ASSERT_EQ(result, OPENED);
-  dir.Close();
+  {
+    Directory dir(new OnDiskDirectoryBackingStore("ScopeTest", path), &handler_,
+                  NULL, NULL, NULL);
+    DirOpenResult result =
+        dir.Open("ScopeTest", &delegate_, NullTransactionObserver());
+    ASSERT_EQ(result, OPENED);
+  }
 
-  // Closing the directory should have released the backing database file.
+  // Destroying the directory should have released the backing database file.
   ASSERT_TRUE(base::DeleteFile(path, true));
 }
 
 class SyncableClientTagTest : public SyncableDirectoryTest {
  public:
   static const int kBaseVersion = 1;
   const char* test_name_;
   const char* test_tag_;
 
   SyncableClientTagTest() : test_name_("test_name"), test_tag_("dietcoke") {}
@@ skipping 80 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