diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 20:34:23 +0000 |
| commit | ea1a3f60aa4527939af680eda25c7697901f643c (patch) | |
| tree | 6835e11842b4ff04ec277a5f961cbf1853b95bae /sync/tools | |
| parent | a628d191e68c0d1d308e1a20a5a4d7bf7884c4c5 (diff) | |
| download | chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.zip chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.gz chromium_src-ea1a3f60aa4527939af680eda25c7697901f643c.tar.bz2 | |
Move scoped_temp_dir from base to base/files
Also add to base namespace.
BUG=
Review URL: https://codereview.chromium.org/11359217
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/tools')
| -rw-r--r-- | sync/tools/sync_client.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sync/tools/sync_client.cc b/sync/tools/sync_client.cc index f49e59e..a7ff438 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. |