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..444eadf533139f1b38de947a7681b7be3cf16bea 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,18 @@ 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() { |
Nico
2017/01/03 18:12:35
probably now big enough to be out-of-line?
Avi (use Gerrit)
2017/01/03 22:54:53
Done.
|
+ std::vector<PermissionRequest*> result; |
+ for (const auto& request : requests_) |
+ result.push_back(request.get()); |
+ return result; |
+ } |
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); |