Index: chrome/browser/extensions/api/tabs/tabs_api_unittest.cc |
diff --git a/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc b/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc |
index 5d0e502fc36b3bda7bffa01417a765c2fb5f7724..91dcbc115e10e2e7e0f6122d4af0f3a632b32927 100644 |
--- a/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc |
+++ b/chrome/browser/extensions/api/tabs/tabs_api_unittest.cc |
@@ -20,13 +20,13 @@ namespace extensions { |
namespace { |
-scoped_ptr<base::ListValue> RunTabsQueryFunction( |
+std::unique_ptr<base::ListValue> RunTabsQueryFunction( |
Browser* browser, |
const Extension* extension, |
const std::string& query_info) { |
scoped_refptr<TabsQueryFunction> function(new TabsQueryFunction()); |
function->set_extension(extension); |
- scoped_ptr<base::Value> value( |
+ std::unique_ptr<base::Value> value( |
extension_function_test_utils::RunFunctionAndReturnSingleResult( |
function.get(), query_info, browser, |
extension_function_test_utils::NONE)); |
@@ -48,8 +48,8 @@ class TabsApiUnitTest : public ExtensionServiceTestBase { |
void TearDown() override; |
// The browser (and accompanying window). |
- scoped_ptr<TestBrowserWindow> browser_window_; |
- scoped_ptr<Browser> browser_; |
+ std::unique_ptr<TestBrowserWindow> browser_window_; |
+ std::unique_ptr<Browser> browser_; |
DISALLOW_COPY_AND_ASSIGN(TabsApiUnitTest); |
}; |
@@ -98,7 +98,7 @@ TEST_F(TabsApiUnitTest, QueryWithoutTabsPermission) { |
// An extension without "tabs" permission will see none of the 3 tabs. |
scoped_refptr<const Extension> extension = test_util::CreateEmptyExtension(); |
- scoped_ptr<base::ListValue> tabs_list_without_permission( |
+ std::unique_ptr<base::ListValue> tabs_list_without_permission( |
RunTabsQueryFunction(browser(), extension.get(), kTitleAndURLQueryInfo)); |
ASSERT_TRUE(tabs_list_without_permission); |
EXPECT_EQ(0u, tabs_list_without_permission->GetSize()); |
@@ -114,8 +114,9 @@ TEST_F(TabsApiUnitTest, QueryWithoutTabsPermission) { |
.Set("permissions", ListBuilder().Append("tabs").Build()) |
.Build()) |
.Build(); |
- scoped_ptr<base::ListValue> tabs_list_with_permission(RunTabsQueryFunction( |
- browser(), extension_with_permission.get(), kTitleAndURLQueryInfo)); |
+ std::unique_ptr<base::ListValue> tabs_list_with_permission( |
+ RunTabsQueryFunction(browser(), extension_with_permission.get(), |
+ kTitleAndURLQueryInfo)); |
ASSERT_TRUE(tabs_list_with_permission); |
ASSERT_EQ(1u, tabs_list_with_permission->GetSize()); |
@@ -165,8 +166,9 @@ TEST_F(TabsApiUnitTest, QueryWithHostPermission) { |
.Build(); |
{ |
- scoped_ptr<base::ListValue> tabs_list_with_permission(RunTabsQueryFunction( |
- browser(), extension_with_permission.get(), kTitleAndURLQueryInfo)); |
+ std::unique_ptr<base::ListValue> tabs_list_with_permission( |
+ RunTabsQueryFunction(browser(), extension_with_permission.get(), |
+ kTitleAndURLQueryInfo)); |
ASSERT_TRUE(tabs_list_with_permission); |
ASSERT_EQ(1u, tabs_list_with_permission->GetSize()); |
@@ -180,8 +182,9 @@ TEST_F(TabsApiUnitTest, QueryWithHostPermission) { |
// Try the same without title, first and third tabs will match. |
const char* kURLQueryInfo = "[{\"url\": \"*://www.google.com/*\"}]"; |
{ |
- scoped_ptr<base::ListValue> tabs_list_with_permission(RunTabsQueryFunction( |
- browser(), extension_with_permission.get(), kURLQueryInfo)); |
+ std::unique_ptr<base::ListValue> tabs_list_with_permission( |
+ RunTabsQueryFunction(browser(), extension_with_permission.get(), |
+ kURLQueryInfo)); |
ASSERT_TRUE(tabs_list_with_permission); |
ASSERT_EQ(2u, tabs_list_with_permission->GetSize()); |