Rename PermissionBubbleRequest to PermissionRequest

chrome/browser/permissions/mock_permission_request.h

 // Copyright 2014 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_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_REQUEST_H_
-#define CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_REQUEST_H_
+#ifndef CHROME_BROWSER_PERMISSIONS_MOCK_PERMISSION_REQUEST_H_
+#define CHROME_BROWSER_PERMISSIONS_MOCK_PERMISSION_REQUEST_H_
 
 #include "base/strings/string16.h"
-#include "chrome/browser/ui/website_settings/permission_bubble_request.h"
+#include "chrome/browser/permissions/permission_request.h"
 #include "url/gurl.h"
 
-class MockPermissionBubbleRequest : public PermissionBubbleRequest {
+class MockPermissionRequest : public PermissionRequest {
  public:
-  MockPermissionBubbleRequest();
-  explicit MockPermissionBubbleRequest(const std::string& text);
-  MockPermissionBubbleRequest(const std::string& text,
+  MockPermissionRequest();
+  explicit MockPermissionRequest(const std::string& text);
+  MockPermissionRequest(const std::string& text,
                               PermissionBubbleType bubble_type);
-  MockPermissionBubbleRequest(const std::string& text, const GURL& url);
-  MockPermissionBubbleRequest(const std::string& text,
+  MockPermissionRequest(const std::string& text, const GURL& url);
+  MockPermissionRequest(const std::string& text,
                               const std::string& accept_label,
                               const std::string& deny_label);
 
-  ~MockPermissionBubbleRequest() override;
+  ~MockPermissionRequest() override;
 
   int GetIconId() const override;
   base::string16 GetMessageTextFragment() const override;
   GURL GetOrigin() const override;
 
   void PermissionGranted() override;
   void PermissionDenied() override;
   void Cancelled() override;
   void RequestFinished() override;
   PermissionBubbleType GetPermissionBubbleType() const override;
 
   bool granted();
   bool cancelled();
   bool finished();
 
  private:
-  MockPermissionBubbleRequest(const std::string& text,
+  MockPermissionRequest(const std::string& text,
                               const std::string& accept_label,
                               const std::string& deny_label,
                               const GURL& url,
                               PermissionBubbleType bubble_type);

[felt, 2016/07/15 17:35:16]

What are you planning to do with PermissionBubbleTypes?

[tsergeant, 2016/07/18 01:27:47]

Plan is to rename to PermissionRequestType. I was going to do that separately,
but I can do it in this CL if you prefer (particularly since I'm touching all
the relevant files already).

[felt, 2016/07/18 04:17:17]

If it's contained within all the same files, I think it would make sense to do
in this CL too. Could you please go ahead and add it?

[tsergeant, 2016/07/18 06:55:29]

Done.

   bool granted_;
   bool cancelled_;
   bool finished_;
   PermissionBubbleType bubble_type_;
 
   base::string16 text_;
   base::string16 accept_label_;
   base::string16 deny_label_;
   GURL origin_;
 };
 
-#endif  // CHROME_BROWSER_UI_WEBSITE_SETTINGS_MOCK_PERMISSION_BUBBLE_REQUEST_H_
+#endif  // CHROME_BROWSER_PERMISSIONS_MOCK_PERMISSION_REQUEST_H_