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

Unified Diff: sync/tools/sync_client.cc

Issue 11359217: Move scoped_temp_dir from base to base/files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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
« no previous file with comments | « sync/syncable/syncable_unittest.cc ('k') | ui/base/resource/data_pack_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sync/tools/sync_client.cc
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc
index f49e59e313d7b94c09d69b49e3c5d4c522d5259f..a7ff43864f561fbb30767f063dd69c2b80609f48 100644
--- a/sync/tools/sync_client.cc
+++ b/sync/tools/sync_client.cc
@@ -11,13 +11,13 @@
#include "base/command_line.h"
#include "base/compiler_specific.h"
#include "base/debug/stack_trace.h"
+#include "base/files/scoped_temp_dir.h"
#include "base/json/json_writer.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop.h"
-#include "base/scoped_temp_dir.h"
#include "base/task_runner.h"
#include "base/threading/thread.h"
#include "jingle/notifier/base/notification_method.h"
@@ -41,8 +41,8 @@
#include "sync/js/js_event_details.h"
#include "sync/js/js_event_handler.h"
#include "sync/notifier/invalidation_state_tracker.h"
-#include "sync/notifier/invalidator_factory.h"
#include "sync/notifier/invalidator.h"
+#include "sync/notifier/invalidator_factory.h"
#include "sync/test/fake_encryptor.h"
#if defined(OS_MACOSX)
@@ -317,7 +317,7 @@ int SyncClientMain(int argc, char* argv[]) {
null_invalidation_state_tracker.AsWeakPtr());
// Set up database directory for the syncer.
- ScopedTempDir database_dir;
+ base::ScopedTempDir database_dir;
CHECK(database_dir.CreateUniqueTempDir());
// Set up model type parameters.
« no previous file with comments | « sync/syncable/syncable_unittest.cc ('k') | ui/base/resource/data_pack_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698