Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(487)

Side by Side Diff: chrome/browser/extensions/extension_action_unittest.cc

Issue 2257113002: Re-write many calls to WrapUnique() with MakeUnique() (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/extension_action.h" 5 #include "chrome/browser/extensions/extension_action.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "chrome/common/extensions/api/extension_action/action_info.h" 9 #include "chrome/common/extensions/api/extension_action/action_info.h"
10 #include "extensions/common/test_util.h" 10 #include "extensions/common/test_util.h"
11 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
12 #include "url/gurl.h" 12 #include "url/gurl.h"
13 13
14 namespace extensions { 14 namespace extensions {
15 15
16 namespace { 16 namespace {
17 17
18 std::unique_ptr<ExtensionAction> CreateAction(ActionInfo::Type type, 18 std::unique_ptr<ExtensionAction> CreateAction(ActionInfo::Type type,
19 const ActionInfo& action_info) { 19 const ActionInfo& action_info) {
20 scoped_refptr<const Extension> extension = test_util::CreateEmptyExtension(); 20 scoped_refptr<const Extension> extension = test_util::CreateEmptyExtension();
21 return base::WrapUnique(new ExtensionAction(*extension, type, action_info)); 21 return base::MakeUnique<ExtensionAction>(*extension, type, action_info);
22 } 22 }
23 23
24 } // namespace 24 } // namespace
25 25
26 TEST(ExtensionActionTest, Title) { 26 TEST(ExtensionActionTest, Title) {
27 ActionInfo action_info; 27 ActionInfo action_info;
28 action_info.default_title = "Initial Title"; 28 action_info.default_title = "Initial Title";
29 std::unique_ptr<ExtensionAction> action = 29 std::unique_ptr<ExtensionAction> action =
30 CreateAction(ActionInfo::TYPE_PAGE, action_info); 30 CreateAction(ActionInfo::TYPE_PAGE, action_info);
31 31
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
160 action->SetPopupUrl(ExtensionAction::kDefaultTabId, url_baz); 160 action->SetPopupUrl(ExtensionAction::kDefaultTabId, url_baz);
161 ASSERT_EQ(url_baz, action->GetPopupUrl(1)); 161 ASSERT_EQ(url_baz, action->GetPopupUrl(1));
162 ASSERT_EQ(url_bar, action->GetPopupUrl(100)); 162 ASSERT_EQ(url_bar, action->GetPopupUrl(100));
163 163
164 action->ClearAllValuesForTab(100); 164 action->ClearAllValuesForTab(100);
165 ASSERT_EQ(url_baz, action->GetPopupUrl(1)); 165 ASSERT_EQ(url_baz, action->GetPopupUrl(1));
166 ASSERT_EQ(url_baz, action->GetPopupUrl(100)); 166 ASSERT_EQ(url_baz, action->GetPopupUrl(100));
167 } 167 }
168 168
169 } // namespace extensions 169 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698