Move requests from Show() argument to PermissionPrompt::Delegate

chrome/browser/ui/permission_bubble/permission_bubble_browser_test_util.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_UI_PERMISSION_BUBBLE_PERMISSION_BUBBLE_BROWSER_TEST_UTIL_H_
 #define CHROME_BROWSER_UI_PERMISSION_BUBBLE_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/permission_bubble/permission_prompt.h"
 
 namespace base {
 class CommandLine;
 }
 class PermissionRequest;
 class Browser;
 
 class TestPermissionBubbleViewDelegate : public PermissionPrompt::Delegate {
  public:
   TestPermissionBubbleViewDelegate();
+  ~TestPermissionBubbleViewDelegate() override;
+
+  const std::vector<PermissionRequest*>& Requests() override;
+  const std::vector<bool>& AcceptStates() override;
 
   void ToggleAccept(int, bool) override {}
   void TogglePersist(bool) override {}
   void Accept() override {}
   void Deny() override {}
   void Closing() override {}
 
+  void SetRequests(std::vector<PermissionRequest*> requests) {

[raymes, 2017/05/11 01:17:54]

nit: set_requests

[Timothy Loh, 2017/05/11 04:42:08]

Done.

+    requests_ = requests;
+  }
+
  private:
+  std::vector<PermissionRequest*> requests_;
+  std::vector<bool> accept_states_;
+
   DISALLOW_COPY_AND_ASSIGN(TestPermissionBubbleViewDelegate);
 };
 
 // Use this class to test on a default window or an app window. Inheriting from
 // ExtensionBrowserTest allows us to easily load and launch apps, and doesn't
 // really add any extra work.
 class PermissionBubbleBrowserTest : public ExtensionBrowserTest {
  public:
   PermissionBubbleBrowserTest();
   ~PermissionBubbleBrowserTest() override;
 
   void SetUpOnMainThread() override;
 
   // Opens an app window, and returns the associated browser.
   Browser* OpenExtensionAppWindow();
 
-  std::vector<PermissionRequest*> requests();
-  std::vector<bool> accept_states() { return accept_states_; }
   PermissionPrompt::Delegate* test_delegate() { return &test_delegate_; }
 
  private:
+  std::vector<PermissionRequest*> requests();

[raymes, 2017/05/11 01:17:54]

nit: no ()

[Timothy Loh, 2017/05/11 04:42:08]

It's a function... anyway I reworked it a bit (inlined the function).

+
   TestPermissionBubbleViewDelegate test_delegate_;
   std::vector<std::unique_ptr<PermissionRequest>> requests_;
   std::vector<bool> accept_states_;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionBubbleBrowserTest);
 };
 
 // Use this class to test on a kiosk window.
 class PermissionBubbleKioskBrowserTest : public PermissionBubbleBrowserTest {
  public:
   PermissionBubbleKioskBrowserTest();
   ~PermissionBubbleKioskBrowserTest() override;
 
   void SetUpCommandLine(base::CommandLine* command_line) override;
 
   DISALLOW_COPY_AND_ASSIGN(PermissionBubbleKioskBrowserTest);
 };
 
 #endif  // CHROME_BROWSER_UI_PERMISSION_BUBBLE_PERMISSION_BUBBLE_BROWSER_TEST_UTIL_H_