| Index: chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| index 1fb541583e4653be952b916505dca24311d38297..9722558c3efa7063b560781b6d5055e7f54a1845 100644
|
| --- a/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| +++ b/chrome/browser/extensions/settings/settings_sync_unittest.cc
|
| @@ -5,11 +5,11 @@
|
| #include "testing/gtest/include/gtest/gtest.h"
|
|
|
| #include "base/bind.h"
|
| +#include "base/files/scoped_temp_dir.h"
|
| #include "base/json/json_reader.h"
|
| #include "base/json/json_writer.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/message_loop.h"
|
| -#include "base/scoped_temp_dir.h"
|
| #include "chrome/browser/extensions/settings/leveldb_settings_storage_factory.h"
|
| #include "chrome/browser/extensions/settings/settings_frontend.h"
|
| #include "chrome/browser/extensions/settings/settings_storage_factory.h"
|
| @@ -255,7 +255,7 @@ class ExtensionSettingsSyncTest : public testing::Test {
|
| content::TestBrowserThread ui_thread_;
|
| content::TestBrowserThread file_thread_;
|
|
|
| - ScopedTempDir temp_dir_;
|
| + base::ScopedTempDir temp_dir_;
|
| scoped_ptr<util::MockProfile> profile_;
|
| scoped_ptr<SettingsFrontend> frontend_;
|
| scoped_refptr<util::ScopedSettingsStorageFactory> storage_factory_;
|
|
|