| Index: chrome/browser/extensions/activity_log/activity_log_browsertest.cc
|
| diff --git a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
|
| index 4069efd882d0f3da408faca8e7a24a39687ec73a..fe59771431881bf0b02f5c4e86437c37b6bb2afa 100644
|
| --- a/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
|
| +++ b/chrome/browser/extensions/activity_log/activity_log_browsertest.cc
|
| @@ -41,7 +41,7 @@ class ActivityLogPrerenderTest : public ExtensionApiTest {
|
| static void Prerender_Arguments(
|
| const std::string& extension_id,
|
| uint16_t port,
|
| - scoped_ptr<std::vector<scoped_refptr<Action>>> i) {
|
| + std::unique_ptr<std::vector<scoped_refptr<Action>>> i) {
|
| // This is to exit RunLoop (base::MessageLoop::current()->Run()) below
|
| base::ThreadTaskRunnerHandle::Get()->PostTask(
|
| FROM_HERE, base::MessageLoop::QuitWhenIdleClosure());
|
| @@ -105,7 +105,7 @@ IN_PROC_BROWSER_TEST_F(ActivityLogPrerenderTest, TestScriptInjected) {
|
| port));
|
|
|
| const gfx::Size kSize(640, 480);
|
| - scoped_ptr<prerender::PrerenderHandle> prerender_handle(
|
| + std::unique_ptr<prerender::PrerenderHandle> prerender_handle(
|
| prerender_manager->AddPrerenderFromOmnibox(
|
| url,
|
| web_contents->GetController().GetDefaultSessionStorageNamespace(),
|
|
|