diff options
Diffstat (limited to 'chrome/browser/extensions')
29 files changed, 84 insertions, 85 deletions
diff --git a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc index ad2605e..7c0117f 100644 --- a/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc +++ b/chrome/browser/extensions/api/downloads/downloads_api_unittest.cc @@ -5,10 +5,10 @@ #include <algorithm> #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" #include "base/json/json_writer.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/stringprintf.h" #include "chrome/browser/download/download_file_icon_extractor.h" @@ -535,7 +535,7 @@ class DownloadExtensionTest : public ExtensionApiTest { downloads_directory_.path()); } - ScopedTempDir downloads_directory_; + base::ScopedTempDir downloads_directory_; const extensions::Extension* extension_; Browser* incognito_browser_; Browser* current_browser_; @@ -1018,7 +1018,7 @@ IN_PROC_BROWSER_TEST_F(DownloadExtensionTest, EXPECT_STREQ("hello", result_string.c_str()); } - // The temporary files should be cleaned up when the ScopedTempDir is removed. + // The temporary files should be cleaned up when the base::ScopedTempDir is removed. } // Test passing the empty query to search(). diff --git a/chrome/browser/extensions/api/file_system/file_system_apitest.cc b/chrome/browser/extensions/api/file_system/file_system_apitest.cc index b2575b5..5497cd7 100644 --- a/chrome/browser/extensions/api/file_system/file_system_apitest.cc +++ b/chrome/browser/extensions/api/file_system/file_system_apitest.cc @@ -37,7 +37,7 @@ class FileSystemApiTest : public extensions::PlatformAppBrowserTest { } FilePath test_root_folder_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; }; IN_PROC_BROWSER_TEST_F(FileSystemApiTest, FileSystemApiGetDisplayPath) { diff --git a/chrome/browser/extensions/api/management/management_api_browsertest.cc b/chrome/browser/extensions/api/management/management_api_browsertest.cc index e8c71f7..193c243 100644 --- a/chrome/browser/extensions/api/management/management_api_browsertest.cc +++ b/chrome/browser/extensions/api/management/management_api_browsertest.cc @@ -4,7 +4,7 @@ #include "base/command_line.h" #include "base/file_path.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "base/string_util.h" #include "base/stringprintf.h" #include "chrome/browser/extensions/api/management/management_api.h" @@ -215,7 +215,7 @@ class ExtensionManagementApiEscalationTest : private: - ScopedTempDir scoped_temp_dir_; + base::ScopedTempDir scoped_temp_dir_; }; const char ExtensionManagementApiEscalationTest::kId[] = diff --git a/chrome/browser/extensions/api/record/record_api_test.cc b/chrome/browser/extensions/api/record/record_api_test.cc index d7d5d6c..a9fdf30 100644 --- a/chrome/browser/extensions/api/record/record_api_test.cc +++ b/chrome/browser/extensions/api/record/record_api_test.cc @@ -6,14 +6,14 @@ #include <string> -#include "base/memory/ref_counted.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" #include "base/string_split.h" -#include "base/stringprintf.h" #include "base/string_util.h" +#include "base/stringprintf.h" #include "base/threading/sequenced_worker_pool.h" #include "base/values.h" #include "chrome/browser/extensions/extension_function_test_utils.h" @@ -270,14 +270,14 @@ class RecordApiTest : public InProcessBrowserTest { std::vector<FilePath> temp_files_; private: - ScopedTempDir scoped_temp_user_data_dir_; + base::ScopedTempDir scoped_temp_user_data_dir_; DISALLOW_COPY_AND_ASSIGN(RecordApiTest); }; IN_PROC_BROWSER_TEST_F(RecordApiTest, CheckCapture) { - ScopedTempDir user_data_dir; + base::ScopedTempDir user_data_dir; scoped_ptr<base::ListValue> result; EXPECT_TRUE(user_data_dir.CreateUniqueTempDir()); @@ -304,7 +304,7 @@ IN_PROC_BROWSER_TEST_F(RecordApiTest, CheckCapture) { #define MAYBE_CheckPlayback CheckPlayback #endif IN_PROC_BROWSER_TEST_F(RecordApiTest, MAYBE_CheckPlayback) { - ScopedTempDir user_data_dir; + base::ScopedTempDir user_data_dir; EXPECT_TRUE(user_data_dir.CreateUniqueTempDir()); diff --git a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc index e23ef85..6f4dcb0 100644 --- a/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc +++ b/chrome/browser/extensions/api/webstore_private/webstore_private_apitest.cc @@ -8,13 +8,13 @@ #include "base/file_util.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" +#include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" #include "chrome/browser/extensions/bundle_installer.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/browser/extensions/extension_function_test_utils.h" #include "chrome/browser/extensions/extension_install_prompt.h" #include "chrome/browser/extensions/extension_install_ui.h" #include "chrome/browser/extensions/extension_service.h" -#include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h" #include "chrome/browser/extensions/webstore_installer.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/ui/browser.h" @@ -153,7 +153,7 @@ class ExtensionWebstorePrivateApiTest : public ExtensionApiTest { return browser()->profile()->GetExtensionService(); } - ScopedTempDir tmp_; + base::ScopedTempDir tmp_; }; class ExtensionWebstorePrivateBundleTest @@ -187,7 +187,7 @@ class ExtensionWebstorePrivateBundleTest // Packs the |manifest| file into a CRX using |id|'s PEM key. void PackCRX(const std::string& id, const std::string& manifest) { // Move the extension to a temporary directory. - ScopedTempDir tmp; + base::ScopedTempDir tmp; ASSERT_TRUE(tmp.CreateUniqueTempDir()); ASSERT_TRUE(file_util::CreateDirectory(tmp.path())); @@ -300,7 +300,7 @@ IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, InstallAccepted) { // Test having the default download directory missing. IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, MissingDownloadDir) { // Set a non-existent directory as the download path. - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; EXPECT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath missing_directory = temp_dir.Take(); EXPECT_TRUE(file_util::Delete(missing_directory, true)); diff --git a/chrome/browser/extensions/app_background_page_apitest.cc b/chrome/browser/extensions/app_background_page_apitest.cc index a052e72..39fce5b 100644 --- a/chrome/browser/extensions/app_background_page_apitest.cc +++ b/chrome/browser/extensions/app_background_page_apitest.cc @@ -77,7 +77,7 @@ class AppBackgroundPageApiTest : public ExtensionApiTest { } private: - ScopedTempDir app_dir_; + base::ScopedTempDir app_dir_; }; // Disable on Mac only. http://crbug.com/95139 diff --git a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc index 380a1c7..b761c58 100644 --- a/chrome/browser/extensions/app_notification_manager_sync_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_sync_unittest.cc @@ -229,7 +229,7 @@ class AppNotificationManagerSyncTest : public testing::Test { content::TestBrowserThread file_thread_; // We keep two TemplateURLServices to test syncing between them. - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; scoped_ptr<TestingProfile> profile_; scoped_refptr<AppNotificationManager> model_; diff --git a/chrome/browser/extensions/app_notification_manager_unittest.cc b/chrome/browser/extensions/app_notification_manager_unittest.cc index 27c1ebf..70ebfc9 100644 --- a/chrome/browser/extensions/app_notification_manager_unittest.cc +++ b/chrome/browser/extensions/app_notification_manager_unittest.cc @@ -70,7 +70,7 @@ class AppNotificationManagerTest : public testing::Test { MessageLoop ui_loop_; content::TestBrowserThread ui_thread_; content::TestBrowserThread file_thread_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; scoped_ptr<TestingProfile> profile_; scoped_refptr<AppNotificationManager> mgr_; }; diff --git a/chrome/browser/extensions/app_notification_storage_unittest.cc b/chrome/browser/extensions/app_notification_storage_unittest.cc index f632879..ac073a9 100644 --- a/chrome/browser/extensions/app_notification_storage_unittest.cc +++ b/chrome/browser/extensions/app_notification_storage_unittest.cc @@ -4,10 +4,10 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "chrome/browser/extensions/app_notification.h" #include "chrome/browser/extensions/app_notification_storage.h" @@ -46,7 +46,7 @@ class AppNotificationStorageTest : public testing::Test { MessageLoop message_loop_; content::TestBrowserThread file_thread_; - ScopedTempDir dir_; + base::ScopedTempDir dir_; FilePath storage_path_; scoped_ptr<AppNotificationStorage> storage_; }; diff --git a/chrome/browser/extensions/convert_user_script.cc b/chrome/browser/extensions/convert_user_script.cc index 007aff3..5f85f5c 100644 --- a/chrome/browser/extensions/convert_user_script.cc +++ b/chrome/browser/extensions/convert_user_script.cc @@ -10,16 +10,16 @@ #include "base/base64.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/user_script_master.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension_file_util.h" +#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/user_script.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" @@ -57,7 +57,7 @@ scoped_refptr<Extension> ConvertUserScriptToExtension( return NULL; } - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) { *error = ASCIIToUTF16("Could not create temporary directory."); return NULL; diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc index 1901636..2853d79 100644 --- a/chrome/browser/extensions/convert_user_script_unittest.cc +++ b/chrome/browser/extensions/convert_user_script_unittest.cc @@ -7,9 +7,9 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "chrome/browser/extensions/convert_user_script.h" #include "chrome/common/chrome_paths.h" @@ -28,7 +28,7 @@ static void AddPattern(URLPatternSet* extent, const std::string& pattern) { namespace extensions { TEST(ExtensionFromUserScript, Basic) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); FilePath test_file; @@ -45,7 +45,7 @@ TEST(ExtensionFromUserScript, Basic) { EXPECT_EQ(string16(), error); // Use a temp dir so that the extensions dir will clean itself up. - ScopedTempDir ext_dir; + base::ScopedTempDir ext_dir; EXPECT_TRUE(ext_dir.Set(extension->path())); // Validate generated extension metadata. @@ -78,7 +78,7 @@ TEST(ExtensionFromUserScript, Basic) { } TEST(ExtensionFromUserScript, NoMetdata) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); FilePath test_file; @@ -95,7 +95,7 @@ TEST(ExtensionFromUserScript, NoMetdata) { EXPECT_EQ(string16(), error); // Use a temp dir so that the extensions dir will clean itself up. - ScopedTempDir ext_dir; + base::ScopedTempDir ext_dir; EXPECT_TRUE(ext_dir.Set(extension->path())); // Validate generated extension metadata. @@ -124,7 +124,7 @@ TEST(ExtensionFromUserScript, NoMetdata) { } TEST(ExtensionFromUserScript, NotUTF8) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); FilePath test_file; @@ -142,7 +142,7 @@ TEST(ExtensionFromUserScript, NotUTF8) { } TEST(ExtensionFromUserScript, RunAtDocumentStart) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); FilePath test_file; @@ -159,7 +159,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentStart) { EXPECT_EQ(string16(), error); // Use a temp dir so that the extensions dir will clean itself up. - ScopedTempDir ext_dir; + base::ScopedTempDir ext_dir; EXPECT_TRUE(ext_dir.Set(extension->path())); // Validate generated extension metadata. @@ -175,7 +175,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentStart) { } TEST(ExtensionFromUserScript, RunAtDocumentEnd) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); FilePath test_file; @@ -192,7 +192,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentEnd) { EXPECT_EQ(string16(), error); // Use a temp dir so that the extensions dir will clean itself up. - ScopedTempDir ext_dir; + base::ScopedTempDir ext_dir; EXPECT_TRUE(ext_dir.Set(extension->path())); // Validate generated extension metadata. @@ -208,7 +208,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentEnd) { } TEST(ExtensionFromUserScript, RunAtDocumentIdle) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); FilePath test_file; @@ -226,7 +226,7 @@ TEST(ExtensionFromUserScript, RunAtDocumentIdle) { EXPECT_EQ(string16(), error); // Use a temp dir so that the extensions dir will clean itself up. - ScopedTempDir ext_dir; + base::ScopedTempDir ext_dir; EXPECT_TRUE(ext_dir.Set(extension->path())); // Validate generated extension metadata. diff --git a/chrome/browser/extensions/convert_web_app.cc b/chrome/browser/extensions/convert_web_app.cc index ea8c8c7..497297d 100644 --- a/chrome/browser/extensions/convert_web_app.cc +++ b/chrome/browser/extensions/convert_web_app.cc @@ -12,17 +12,17 @@ #include "base/base64.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/logging.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/extension_file_util.h" +#include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/web_apps.h" #include "crypto/sha2.h" #include "googleurl/src/gurl.h" @@ -94,7 +94,7 @@ scoped_refptr<Extension> ConvertWebAppToExtension( return NULL; } - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; if (!temp_dir.CreateUniqueTempDirUnderPath(install_temp_dir)) { LOG(ERROR) << "Could not create temporary directory."; return NULL; diff --git a/chrome/browser/extensions/convert_web_app_unittest.cc b/chrome/browser/extensions/convert_web_app_unittest.cc index f726acc..fe97b66 100644 --- a/chrome/browser/extensions/convert_web_app_unittest.cc +++ b/chrome/browser/extensions/convert_web_app_unittest.cc @@ -9,8 +9,8 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "base/time.h" #include "base/utf_string_conversions.h" @@ -93,7 +93,7 @@ TEST(ExtensionFromWebApp, GenerateVersion) { } TEST(ExtensionFromWebApp, Basic) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); WebApplicationInfo web_app; @@ -116,7 +116,7 @@ TEST(ExtensionFromWebApp, Basic) { extensions_dir.path()); ASSERT_TRUE(extension.get()); - ScopedTempDir extension_dir; + base::ScopedTempDir extension_dir; EXPECT_TRUE(extension_dir.Set(extension->path())); EXPECT_TRUE(extension->is_app()); @@ -150,7 +150,7 @@ TEST(ExtensionFromWebApp, Basic) { } TEST(ExtensionFromWebApp, Minimal) { - ScopedTempDir extensions_dir; + base::ScopedTempDir extensions_dir; ASSERT_TRUE(extensions_dir.CreateUniqueTempDir()); WebApplicationInfo web_app; @@ -163,7 +163,7 @@ TEST(ExtensionFromWebApp, Minimal) { extensions_dir.path()); ASSERT_TRUE(extension.get()); - ScopedTempDir extension_dir; + base::ScopedTempDir extension_dir; EXPECT_TRUE(extension_dir.Set(extension->path())); EXPECT_TRUE(extension->is_app()); diff --git a/chrome/browser/extensions/crx_installer.cc b/chrome/browser/extensions/crx_installer.cc index 5076c78..121e291 100644 --- a/chrome/browser/extensions/crx_installer.cc +++ b/chrome/browser/extensions/crx_installer.cc @@ -9,10 +9,10 @@ #include "base/bind.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/lazy_instance.h" #include "base/metrics/histogram.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/sequenced_task_runner.h" #include "base/string_util.h" #include "base/stringprintf.h" diff --git a/chrome/browser/extensions/extension_browsertest.cc b/chrome/browser/extensions/extension_browsertest.cc index 56ff0b6..0d07120 100644 --- a/chrome/browser/extensions/extension_browsertest.cc +++ b/chrome/browser/extensions/extension_browsertest.cc @@ -9,8 +9,8 @@ #include "base/command_line.h" #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/utf_string_conversions.h" diff --git a/chrome/browser/extensions/extension_browsertest.h b/chrome/browser/extensions/extension_browsertest.h index 8f9f1e1..b1e82a0 100644 --- a/chrome/browser/extensions/extension_browsertest.h +++ b/chrome/browser/extensions/extension_browsertest.h @@ -10,11 +10,11 @@ #include "base/command_line.h" #include "base/compiler_specific.h" #include "base/file_path.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "chrome/browser/extensions/extension_host.h" #include "chrome/common/extensions/extension.h" -#include "chrome/common/extensions/features/feature.h" #include "chrome/common/extensions/feature_switch.h" +#include "chrome/common/extensions/features/feature.h" #include "chrome/test/base/in_process_browser_test.h" #include "content/public/browser/notification_details.h" #include "content/public/browser/notification_observer.h" @@ -204,7 +204,7 @@ class ExtensionBrowserTest : virtual public InProcessBrowserTest, private: // Temporary directory for testing. - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; // Specifies the type of UI (if any) to show during installation and what // user action to simulate. diff --git a/chrome/browser/extensions/extension_creator.cc b/chrome/browser/extensions/extension_creator.cc index 7c06df6..c04c486 100644 --- a/chrome/browser/extensions/extension_creator.cc +++ b/chrome/browser/extensions/extension_creator.cc @@ -10,8 +10,8 @@ #include "base/bind.h" #include "base/callback.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_handle.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/browser/extensions/crx_file.h" #include "chrome/browser/extensions/extension_creator_filter.h" @@ -308,7 +308,7 @@ bool ExtensionCreator::Run(const FilePath& extension_dir, if (!ValidateManifest(extension_dir, key_pair.get(), run_flags)) return false; - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; if (!temp_dir.CreateUniqueTempDir()) return false; diff --git a/chrome/browser/extensions/extension_creator_filter_unittest.cc b/chrome/browser/extensions/extension_creator_filter_unittest.cc index 59e624b..657624b 100644 --- a/chrome/browser/extensions/extension_creator_filter_unittest.cc +++ b/chrome/browser/extensions/extension_creator_filter_unittest.cc @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" -#include "base/scoped_temp_dir.h" #include "chrome/browser/extensions/extension_creator_filter.h" #include "testing/gtest/include/gtest/gtest.h" #include "testing/platform_test.h" @@ -32,7 +32,7 @@ class ExtensionCreatorFilterTest : public PlatformTest { scoped_refptr<extensions::ExtensionCreatorFilter> filter_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; FilePath test_dir_; }; diff --git a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc index 9a12338..f2fea19 100644 --- a/chrome/browser/extensions/extension_disabled_ui_browsertest.cc +++ b/chrome/browser/extensions/extension_disabled_ui_browsertest.cc @@ -3,7 +3,7 @@ // found in the LICENSE file. #include "base/file_path.h" -#include "base/scoped_temp_dir.h" +#include "base/files/scoped_temp_dir.h" #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/extensions/extension_browsertest.h" #include "chrome/browser/extensions/extension_prefs.h" @@ -84,7 +84,7 @@ class ExtensionDisabledGlobalErrorTest : public ExtensionBrowserTest { } ExtensionService* service_; - ScopedTempDir scoped_temp_dir_; + base::ScopedTempDir scoped_temp_dir_; FilePath path_v1_; FilePath path_v2_; FilePath path_v3_; diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc index 761908c..87a9ba5b 100644 --- a/chrome/browser/extensions/extension_prefs_unittest.cc +++ b/chrome/browser/extensions/extension_prefs_unittest.cc @@ -5,17 +5,17 @@ #include "extension_prefs_unittest.h" #include "base/basictypes.h" +#include "base/files/scoped_temp_dir.h" #include "base/path_service.h" #include "base/prefs/public/pref_change_registrar.h" -#include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/string_number_conversions.h" #include "base/stringprintf.h" #include "base/values.h" #include "chrome/browser/extensions/extension_pref_value_map.h" #include "chrome/browser/extensions/extension_prefs.h" -#include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/browser/prefs/pref_observer_mock.h" +#include "chrome/browser/prefs/scoped_user_pref_update.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_manifest_constants.h" #include "chrome/common/extensions/permissions/permission_set.h" diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc index 1d19fa0..f74f0cf 100644 --- a/chrome/browser/extensions/extension_service_unittest.cc +++ b/chrome/browser/extensions/extension_service_unittest.cc @@ -13,6 +13,7 @@ #include "base/bind.h" #include "base/command_line.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/json/json_file_value_serializer.h" #include "base/json/json_reader.h" #include "base/json/json_string_value_serializer.h" @@ -20,7 +21,6 @@ #include "base/memory/weak_ptr.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/stl_util.h" #include "base/string16.h" #include "base/string_number_conversions.h" @@ -633,7 +633,7 @@ class ExtensionServiceTest InstallState install_state, int creation_flags) { FilePath crx_path; - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; EXPECT_TRUE(temp_dir.CreateUniqueTempDir()); crx_path = temp_dir.path().AppendASCII("temp.crx"); @@ -1826,7 +1826,7 @@ TEST_F(ExtensionServiceTest, PackExtension) { .AppendASCII("behllobkkfkfnphdnhnkndlbkcpglgmj") .AppendASCII("1.0.0.0"); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath output_directory = temp_dir.path(); @@ -1864,7 +1864,7 @@ TEST_F(ExtensionServiceTest, PackExtension) { // Try packing an empty directory. Should fail because an empty directory is // not a valid extension. - ScopedTempDir temp_dir2; + base::ScopedTempDir temp_dir2; ASSERT_TRUE(temp_dir2.CreateUniqueTempDir()); creator.reset(new ExtensionCreator()); ASSERT_FALSE(creator->Run(temp_dir2.path(), crx_path, privkey_path, @@ -1889,7 +1889,7 @@ TEST_F(ExtensionServiceTest, PackPunctuatedExtension) { .AppendASCII(good0) .AppendASCII("1.0.0.0"); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); // Extension names containing punctuation, and the expected names for the @@ -1946,7 +1946,7 @@ TEST_F(ExtensionServiceTest, PackPunctuatedExtension) { TEST_F(ExtensionServiceTest, PackExtensionContainingKeyFails) { InitializeEmptyExtensionService(); - ScopedTempDir extension_temp_dir; + base::ScopedTempDir extension_temp_dir; ASSERT_TRUE(extension_temp_dir.CreateUniqueTempDir()); FilePath input_directory = extension_temp_dir.path().AppendASCII("ext"); ASSERT_TRUE(file_util::CopyDirectory( @@ -1958,7 +1958,7 @@ TEST_F(ExtensionServiceTest, PackExtensionContainingKeyFails) { input_directory, /*recursive=*/true)); - ScopedTempDir output_temp_dir; + base::ScopedTempDir output_temp_dir; ASSERT_TRUE(output_temp_dir.CreateUniqueTempDir()); FilePath output_directory = output_temp_dir.path(); @@ -2003,7 +2003,7 @@ TEST_F(ExtensionServiceTest, PackExtensionOpenSSLKey) { "openssl_privkey_asn1.pem")); ASSERT_TRUE(file_util::PathExists(privkey_path)); - ScopedTempDir temp_dir; + base::ScopedTempDir temp_dir; ASSERT_TRUE(temp_dir.CreateUniqueTempDir()); FilePath output_directory = temp_dir.path(); @@ -2075,7 +2075,7 @@ TEST_F(ExtensionServiceTest, LoadLocalizedTheme) { TEST_F(ExtensionServiceTest, UnpackedExtensionCanChangeID) { InitializeEmptyExtensionService(); - ScopedTempDir temp; + base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); FilePath extension_path = temp.path(); @@ -2127,7 +2127,7 @@ TEST_F(ExtensionServiceTest, UnpackedExtensionMayContainSymlinkedFiles) { ASSERT_TRUE(file_util::PathExists(source_icon)); // Set up the temporary extension directory. - ScopedTempDir temp; + base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); FilePath extension_path = temp.path(); FilePath manifest = extension_path.Append(Extension::kManifestFilename); @@ -2570,7 +2570,7 @@ TEST_F(ExtensionServiceTest, UpdateExtensionPreservesLocation) { TEST_F(ExtensionServiceTest, LoadExtensionsCanDowngrade) { InitializeEmptyExtensionService(); - ScopedTempDir temp; + base::ScopedTempDir temp; ASSERT_TRUE(temp.CreateUniqueTempDir()); // We'll write the extension manifest dynamically to a temporary path diff --git a/chrome/browser/extensions/extension_service_unittest.h b/chrome/browser/extensions/extension_service_unittest.h index 64aef9b..2da36f6 100644 --- a/chrome/browser/extensions/extension_service_unittest.h +++ b/chrome/browser/extensions/extension_service_unittest.h @@ -7,10 +7,10 @@ #include "base/at_exit.h" #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "chrome/browser/extensions/extension_service.h" #include "chrome/common/extensions/feature_switch.h" #include "content/public/test/test_browser_thread.h" @@ -56,7 +56,7 @@ class ExtensionServiceTestBase : public testing::Test { MessageLoop loop_; base::ShadowingAtExitManager at_exit_manager_; - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; scoped_ptr<TestingProfile> profile_; FilePath extensions_install_dir_; FilePath data_dir_; diff --git a/chrome/browser/extensions/menu_manager_unittest.cc b/chrome/browser/extensions/menu_manager_unittest.cc index c8f8c24..c707144 100644 --- a/chrome/browser/extensions/menu_manager_unittest.cc +++ b/chrome/browser/extensions/menu_manager_unittest.cc @@ -4,20 +4,20 @@ #include <vector> +#include "base/files/scoped_temp_dir.h" #include "base/json/json_reader.h" #include "base/memory/scoped_vector.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/browser/extensions/event_names.h" #include "chrome/browser/extensions/event_router.h" #include "chrome/browser/extensions/extension_system_factory.h" #include "chrome/browser/extensions/menu_manager.h" -#include "chrome/browser/prefs/pref_service.h" #include "chrome/browser/extensions/test_extension_prefs.h" #include "chrome/browser/extensions/test_extension_system.h" +#include "chrome/browser/prefs/pref_service.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension.h" diff --git a/chrome/browser/extensions/sandboxed_unpacker.h b/chrome/browser/extensions/sandboxed_unpacker.h index 67af256..dc337c71 100644 --- a/chrome/browser/extensions/sandboxed_unpacker.h +++ b/chrome/browser/extensions/sandboxed_unpacker.h @@ -8,8 +8,8 @@ #include <string> #include "base/file_path.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" -#include "base/scoped_temp_dir.h" #include "chrome/common/extensions/extension.h" #include "content/public/browser/browser_thread.h" #include "content/public/browser/utility_process_host_client.h" @@ -205,7 +205,7 @@ class SandboxedUnpacker : public content::UtilityProcessHostClient { FilePath extensions_dir_; // A temporary directory to use for unpacking. - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; // The root directory of the unpacked extension. This is a child of temp_dir_. FilePath extension_root_; diff --git a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc index 11c4dd1..7c050b5 100644 --- a/chrome/browser/extensions/sandboxed_unpacker_unittest.cc +++ b/chrome/browser/extensions/sandboxed_unpacker_unittest.cc @@ -3,11 +3,10 @@ // found in the LICENSE file. #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/ref_counted.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "base/values.h" #include "chrome/browser/extensions/sandboxed_unpacker.h" @@ -157,8 +156,8 @@ class SandboxedUnpackerTest : public testing::Test { } protected: - ScopedTempDir temp_dir_; - ScopedTempDir extensions_dir_; + base::ScopedTempDir temp_dir_; + base::ScopedTempDir extensions_dir_; FilePath temp_path_; MockSandboxedUnpackerClient* client_; scoped_ptr<Unpacker> unpacker_; diff --git a/chrome/browser/extensions/settings/settings_frontend_unittest.cc b/chrome/browser/extensions/settings/settings_frontend_unittest.cc index 0e4ef16..570d2a3 100644 --- a/chrome/browser/extensions/settings/settings_frontend_unittest.cc +++ b/chrome/browser/extensions/settings/settings_frontend_unittest.cc @@ -6,9 +6,9 @@ #include "base/bind.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop.h" -#include "base/scoped_temp_dir.h" #include "base/stringprintf.h" #include "chrome/browser/extensions/settings/leveldb_settings_storage_factory.h" #include "chrome/browser/extensions/settings/settings_frontend.h" @@ -77,7 +77,7 @@ class ExtensionSettingsFrontendTest : public testing::Test { SettingsFrontend::Create(storage_factory_.get(), profile_.get())); } - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; scoped_ptr<util::MockProfile> profile_; scoped_ptr<SettingsFrontend> frontend_; scoped_refptr<util::ScopedSettingsStorageFactory> storage_factory_; diff --git a/chrome/browser/extensions/settings/settings_sync_unittest.cc b/chrome/browser/extensions/settings/settings_sync_unittest.cc index 1fb5415..9722558 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_; diff --git a/chrome/browser/extensions/test_extension_prefs.h b/chrome/browser/extensions/test_extension_prefs.h index dfd05e2..b4b92dd 100644 --- a/chrome/browser/extensions/test_extension_prefs.h +++ b/chrome/browser/extensions/test_extension_prefs.h @@ -7,8 +7,8 @@ #include <string> +#include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" -#include "base/scoped_temp_dir.h" #include "chrome/common/extensions/extension.h" class ExtensionPrefValueMap; @@ -72,7 +72,7 @@ class TestExtensionPrefs { void set_extensions_disabled(bool extensions_disabled); protected: - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; FilePath preferences_file_; FilePath extensions_dir_; scoped_ptr<PrefService> pref_service_; diff --git a/chrome/browser/extensions/user_script_master_unittest.cc b/chrome/browser/extensions/user_script_master_unittest.cc index 0aabb5a..02bfaa4 100644 --- a/chrome/browser/extensions/user_script_master_unittest.cc +++ b/chrome/browser/extensions/user_script_master_unittest.cc @@ -8,9 +8,9 @@ #include "base/file_path.h" #include "base/file_util.h" +#include "base/files/scoped_temp_dir.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" #include "base/string_util.h" #include "chrome/common/chrome_notification_types.h" #include "chrome/test/base/testing_profile.h" @@ -74,7 +74,7 @@ class UserScriptMasterTest : public testing::Test, } // Directory containing user scripts. - ScopedTempDir temp_dir_; + base::ScopedTempDir temp_dir_; content::NotificationRegistrar registrar_; |