Remove ScopedVector from ContentBrowserClient.

chrome/browser/extensions/extension_navigation_throttle_unittest.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // 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"
 #include "content/public/browser/content_browser_client.h"
 #include "content/public/browser/navigation_handle.h"
 #include "content/public/common/content_client.h"
 #include "content/public/test/test_renderer_host.h"
 #include "content/public/test/web_contents_tester.h"
 #include "extensions/browser/extension_navigation_throttle.h"
 #include "extensions/browser/extension_registry.h"
@@ skipping 14 matching lines @@
 const char kAccessibleDir[] = "accessible_dir/*";
 const char kAccessibleDirResource[] = "accessible_dir/foo.html";
 
 class MockBrowserClient : public content::ContentBrowserClient {
  public:
   MockBrowserClient() {}
   ~MockBrowserClient() override {}
 
   // 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;
   }
 };
 
 }  // namespace
 
 class ExtensionNavigationThrottleUnitTest
     : public ChromeRenderViewHostTestHarness {
  public:
   ExtensionNavigationThrottleUnitTest() {}
   void SetUp() override {
     ChromeRenderViewHostTestHarness::SetUp();
     original_client_ = content::SetBrowserClientForTesting(&client_);
     AddExtension();
   }
 
   void TearDown() override {
     content::SetBrowserClientForTesting(original_client_);
     ChromeRenderViewHostTestHarness::TearDown();
   }
 
   // Checks that trying to navigate the given |host| to |url| results in the
   // |expected_result|.
   void CheckTestCase(content::RenderFrameHost* host,
                      const GURL& url,
                      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::Referrer(), ...) (and likewise for
hase_user_gesture and is_external_protocol if you feel like it).

clang-format knows not to put a space after the /*foo=*/ comment if it ends in
=, and that way it's 100% clear what this means. As is, it could mean "not post
is set to false (so post is yes)"

[Avi (use Gerrit), 2017/01/12 19:05:37]

Done, and thank you for this; I didn't know this and it's useful.

+                  content::Referrer(), false, ui::PAGE_TRANSITION_LINK, false))
         << url;
   }
 
   const Extension* extension() { return extension_.get(); }
   content::WebContentsTester* web_contents_tester() {
     return content::WebContentsTester::For(web_contents());
   }
   content::RenderFrameHostTester* render_frame_host_tester(
       content::RenderFrameHost* host) {
     return content::RenderFrameHostTester::For(host);
@@ skipping 99 matching lines @@
 
   std::string second_id = crx_file::id_util::GenerateId("bar");
   ASSERT_NE(second_id, extension()->id());
   GURL invalid_url(base::StringPrintf("chrome-extension://%s/accessible.html",
                                       second_id.c_str()));
   // Requests to non-existent extensions should be blocked.
   CheckTestCase(child, invalid_url, NavigationThrottle::BLOCK_REQUEST);
 }
 
 }  // namespace extensions