| Index: chrome/browser/extensions/extension_user_script_loader_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_user_script_loader_unittest.cc b/chrome/browser/extensions/extension_user_script_loader_unittest.cc
|
| index 2e5db25ca8e6e93e0260b0990c64cc10d83c2e51..be35974c33d0cdc2ebf5907e67115c5342faf0c5 100644
|
| --- a/chrome/browser/extensions/extension_user_script_loader_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_user_script_loader_unittest.cc
|
| @@ -13,6 +13,7 @@
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/location.h"
|
| +#include "base/memory/ptr_util.h"
|
| #include "base/single_thread_task_runner.h"
|
| #include "base/strings/string_util.h"
|
| #include "chrome/browser/chrome_notification_types.h"
|
| @@ -236,12 +237,12 @@ TEST_F(ExtensionUserScriptLoaderTest, SkipBOMAtTheBeginning) {
|
| size_t written = base::WriteFile(path, content.c_str(), content.size());
|
| ASSERT_EQ(written, content.size());
|
|
|
| - UserScript user_script;
|
| - user_script.js_scripts().push_back(
|
| - UserScript::File(temp_dir_.path(), path.BaseName(), GURL()));
|
| + std::unique_ptr<UserScript> user_script(new UserScript());
|
| + user_script->js_scripts().push_back(base::MakeUnique<UserScript::File>(
|
| + temp_dir_.path(), path.BaseName(), GURL()));
|
|
|
| UserScriptList user_scripts;
|
| - user_scripts.push_back(user_script);
|
| + user_scripts.push_back(std::move(user_script));
|
|
|
| TestingProfile profile;
|
| ExtensionUserScriptLoader loader(
|
| @@ -251,7 +252,7 @@ TEST_F(ExtensionUserScriptLoaderTest, SkipBOMAtTheBeginning) {
|
| loader.LoadScriptsForTest(&user_scripts);
|
|
|
| EXPECT_EQ(content.substr(3),
|
| - user_scripts[0].js_scripts()[0].GetContent().as_string());
|
| + user_scripts[0]->js_scripts()[0]->GetContent().as_string());
|
| }
|
|
|
| TEST_F(ExtensionUserScriptLoaderTest, LeaveBOMNotAtTheBeginning) {
|
| @@ -260,12 +261,12 @@ TEST_F(ExtensionUserScriptLoaderTest, LeaveBOMNotAtTheBeginning) {
|
| size_t written = base::WriteFile(path, content.c_str(), content.size());
|
| ASSERT_EQ(written, content.size());
|
|
|
| - UserScript user_script;
|
| - user_script.js_scripts().push_back(UserScript::File(
|
| + std::unique_ptr<UserScript> user_script(new UserScript());
|
| + user_script->js_scripts().push_back(base::MakeUnique<UserScript::File>(
|
| temp_dir_.path(), path.BaseName(), GURL()));
|
|
|
| UserScriptList user_scripts;
|
| - user_scripts.push_back(user_script);
|
| + user_scripts.push_back(std::move(user_script));
|
|
|
| TestingProfile profile;
|
| ExtensionUserScriptLoader loader(
|
| @@ -274,7 +275,8 @@ TEST_F(ExtensionUserScriptLoaderTest, LeaveBOMNotAtTheBeginning) {
|
| true /* listen_for_extension_system_loaded */);
|
| loader.LoadScriptsForTest(&user_scripts);
|
|
|
| - EXPECT_EQ(content, user_scripts[0].js_scripts()[0].GetContent().as_string());
|
| + EXPECT_EQ(content,
|
| + user_scripts[0]->js_scripts()[0]->GetContent().as_string());
|
| }
|
|
|
| } // namespace extensions
|
|
|