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

Unified Diff: chrome/browser/extensions/extension_navigation_throttle_unittest.cc

Issue 2618393003: Remove ScopedVector from ContentBrowserClient. (Closed)
Patch Set: cleaner a bit Created 3 years, 11 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/extension_navigation_throttle_unittest.cc
diff --git a/chrome/browser/extensions/extension_navigation_throttle_unittest.cc b/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
index cd7a2020b29cbc3207d0907182015bad788c574a..d08cb25801b66b04cc0095a40f812ea3b534ffd5 100644
--- a/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
+++ b/chrome/browser/extensions/extension_navigation_throttle_unittest.cc
@@ -2,6 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "base/memory/ptr_util.h"
#include "base/strings/stringprintf.h"
#include "chrome/test/base/chrome_render_view_host_test_harness.h"
#include "components/crx_file/id_util.h"
@@ -36,11 +37,13 @@ class MockBrowserClient : public content::ContentBrowserClient {
// Only construct an ExtensionNavigationThrottle so that we can test it in
// isolation.
- ScopedVector<NavigationThrottle> CreateThrottlesForNavigation(
+ std::vector<std::unique_ptr<NavigationThrottle>> CreateThrottlesForNavigation(
content::NavigationHandle* handle) override {
- ScopedVector<NavigationThrottle> throttles;
- if (!handle->IsInMainFrame()) // Mirrors ChromeContentBrowserClient.
- throttles.push_back(new ExtensionNavigationThrottle(handle));
+ std::vector<std::unique_ptr<NavigationThrottle>> throttles;
+ if (!handle->IsInMainFrame()) { // Mirrors ChromeContentBrowserClient.
+ throttles.push_back(
+ base::MakeUnique<ExtensionNavigationThrottle>(handle));
+ }
return throttles;
}
};
@@ -69,10 +72,10 @@ class ExtensionNavigationThrottleUnitTest
NavigationThrottle::ThrottleCheckResult expected_result) {
std::unique_ptr<content::NavigationHandle> handle =
content::NavigationHandle::CreateNavigationHandleForTesting(url, host);
- EXPECT_EQ(expected_result, handle->CallWillStartRequestForTesting(
- false, //not post
- content::Referrer(), false,
- ui::PAGE_TRANSITION_LINK, false))
+ EXPECT_EQ(expected_result,
+ handle->CallWillStartRequestForTesting(
+ false, // not post
Nico 2017/01/12 16:55:23 nit: use CallW..(/*is_post=*/false, content::Refer
Avi (use Gerrit) 2017/01/12 19:05:37 Done, and thank you for this; I didn't know this a
+ content::Referrer(), false, ui::PAGE_TRANSITION_LINK, false))
<< url;
}

Powered by Google App Engine
This is Rietveld 408576698