| Index: chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
|
| diff --git a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
|
| index 17f89b1deda078090f3aaf38604847894a4b6910..00cfcc29ac01643eb568dc48e81c0cd7175e7a34 100644
|
| --- a/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
|
| +++ b/chrome/browser/extensions/api/declarative_content/declarative_content_apitest.cc
|
| @@ -704,7 +704,7 @@ class ShowPageActionWithoutPageActionTest : public DeclarativeContentApiTest {
|
| }
|
|
|
| bool enable_redesign_;
|
| - scoped_ptr<FeatureSwitch::ScopedOverride> override_toolbar_redesign_;
|
| + std::unique_ptr<FeatureSwitch::ScopedOverride> override_toolbar_redesign_;
|
| DISALLOW_COPY_AND_ASSIGN(ShowPageActionWithoutPageActionTest);
|
| };
|
|
|
| @@ -837,7 +837,7 @@ IN_PROC_BROWSER_TEST_F(DeclarativeContentApiTest,
|
| browser()->tab_strip_model()->GetWebContentsAt(0);
|
|
|
| AddTabAtIndex(1, GURL("http://test2/"), ui::PAGE_TRANSITION_LINK);
|
| - scoped_ptr<content::WebContents> tab2(
|
| + std::unique_ptr<content::WebContents> tab2(
|
| browser()->tab_strip_model()->GetWebContentsAt(1));
|
|
|
| // Add a rule matching the second tab.
|
|
|