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

Unified Diff: chrome/browser/ui/website_settings/permission_bubble_browser_test_util.h

Issue 2606293002: Remove ScopedVector from chrome/browser/ui. (Closed)
Patch Set: one last fix 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/ui/website_settings/permission_bubble_browser_test_util.h
diff --git a/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.h b/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.h
index 1df46decf13ff4d9b35652344281577f82396491..752bbc65df5e7ff8bc221535e3f2e3c7e87e3fd9 100644
--- a/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.h
+++ b/chrome/browser/ui/website_settings/permission_bubble_browser_test_util.h
@@ -5,6 +5,9 @@
#ifndef CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_BROWSER_TEST_UTIL_H_
#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_PERMISSION_BUBBLE_BROWSER_TEST_UTIL_H_
+#include <memory>
+#include <vector>
+
#include "base/macros.h"
#include "chrome/browser/extensions/extension_browsertest.h"
#include "chrome/browser/ui/website_settings/permission_prompt.h"
@@ -42,13 +45,13 @@ class PermissionBubbleBrowserTest : public ExtensionBrowserTest {
// Opens an app window, and returns the associated browser.
Browser* OpenExtensionAppWindow();
- std::vector<PermissionRequest*> requests() { return requests_.get(); }
+ std::vector<PermissionRequest*> requests();
std::vector<bool> accept_states() { return accept_states_; }
PermissionPrompt::Delegate* test_delegate() { return &test_delegate_; }
private:
TestPermissionBubbleViewDelegate test_delegate_;
- ScopedVector<PermissionRequest> requests_;
+ std::vector<std::unique_ptr<PermissionRequest>> requests_;
std::vector<bool> accept_states_;
DISALLOW_COPY_AND_ASSIGN(PermissionBubbleBrowserTest);

Powered by Google App Engine
This is Rietveld 408576698