| Index: chrome/browser/ui/panels/base_panel_browser_test.cc
|
| diff --git a/chrome/browser/ui/panels/base_panel_browser_test.cc b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| index 1843cd996e5a224d0b04ab8f37101a9d0e3782b1..ee37aac70617e606817c4b74ca7d09939bc20813 100644
|
| --- a/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| +++ b/chrome/browser/ui/panels/base_panel_browser_test.cc
|
| @@ -282,7 +282,7 @@ void BasePanelBrowserTest::WaitForPanelActiveState(
|
| expected_state == SHOW_AS_INACTIVE);
|
|
|
| #if defined(OS_MACOSX)
|
| - scoped_ptr<NativePanelTesting> panel_testing(
|
| + std::unique_ptr<NativePanelTesting> panel_testing(
|
| CreateNativePanelTesting(panel));
|
| ASSERT_TRUE(panel_testing->EnsureApplicationRunOnForeground()) <<
|
| "Failed to bring application to foreground. Bail out.";
|
| @@ -293,7 +293,7 @@ void BasePanelBrowserTest::WaitForPanelActiveState(
|
| }
|
|
|
| void BasePanelBrowserTest::WaitForBoundsAnimationFinished(Panel* panel) {
|
| - scoped_ptr<NativePanelTesting> panel_testing(
|
| + std::unique_ptr<NativePanelTesting> panel_testing(
|
| CreateNativePanelTesting(panel));
|
| // Sometimes there are several animations in sequence due to content
|
| // auto resizing. Wait for all animations to finish.
|
| @@ -524,7 +524,7 @@ scoped_refptr<Extension> BasePanelBrowserTest::CreateExtension(
|
| extensions::ExtensionPrefs::Get(browser()->profile());
|
| base::FilePath full_path = extension_prefs->install_directory().Append(path);
|
|
|
| - scoped_ptr<base::DictionaryValue> input_value(extra_value.DeepCopy());
|
| + std::unique_ptr<base::DictionaryValue> input_value(extra_value.DeepCopy());
|
| input_value->SetString(extensions::manifest_keys::kVersion, "1.0.0.0");
|
| input_value->SetString(extensions::manifest_keys::kName, "Sample Extension");
|
|
|
|
|