Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: chrome/browser/sync/test/engine/test_directory_setter_upper.cc

Issue 8586014: [Sync] Replace uses of ObserverListThreadSafe with WeakHandles (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/engine/test_directory_setter_upper.cc
diff --git a/chrome/browser/sync/test/engine/test_directory_setter_upper.cc b/chrome/browser/sync/test/engine/test_directory_setter_upper.cc
index 4123540d63ebf2c8ef902f01c62e6aca9a271734..7cdb2a49faf9c2538eb75995231051c83d2ad5c9 100644
--- a/chrome/browser/sync/test/engine/test_directory_setter_upper.cc
+++ b/chrome/browser/sync/test/engine/test_directory_setter_upper.cc
@@ -10,9 +10,11 @@
#include "base/string_util.h"
#include "chrome/browser/sync/syncable/directory_manager.h"
#include "chrome/browser/sync/syncable/syncable.h"
+#include "chrome/browser/sync/test/null_transaction_observer.h"
#include "testing/gtest/include/gtest/gtest.h"
using syncable::DirectoryManager;
+using syncable::NullTransactionObserver;
using syncable::ReadTransaction;
using syncable::ScopedDirLookup;
@@ -38,7 +40,7 @@ void TestDirectorySetterUpper::reset_directory_manager(DirectoryManager* d) {
void TestDirectorySetterUpper::SetUp() {
Init();
- ASSERT_TRUE(manager()->Open(name(), &delegate_));
+ ASSERT_TRUE(manager()->Open(name(), &delegate_, NullTransactionObserver()));
}
void TestDirectorySetterUpper::TearDown() {
@@ -80,7 +82,8 @@ void ManuallyOpenedTestDirectorySetterUpper::SetUp() {
}
void ManuallyOpenedTestDirectorySetterUpper::Open() {
- ASSERT_TRUE(manager()->Open(name(), &delegate_));
+ ASSERT_TRUE(
+ manager()->Open(name(), &delegate_, NullTransactionObserver()));
was_opened_ = true;
}
@@ -111,7 +114,7 @@ void TriggeredOpenTestDirectorySetterUpper::TearDown() {
MockDirectorySetterUpper::MockDirectory::MockDirectory(
const std::string& name) {
- InitKernel(name, &delegate_);
+ InitKernelForTest(name, &delegate_, NullTransactionObserver());
}
MockDirectorySetterUpper::MockDirectory::~MockDirectory() {}

Powered by Google App Engine
This is Rietveld 408576698