Rename PermissionBubbleRequest to PermissionRequest

chrome/browser/ui/cocoa/website_settings/permission_bubble_controller_unittest.mm

 // 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.
 
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_controller.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/mac/foundation_util.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/mac/sdk_forward_declarations.h"
 #include "base/stl_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/permissions/mock_permission_request.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/cocoa_profile_test.h"
 #include "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #include "chrome/browser/ui/cocoa/run_loop_testing.h"
 #import "chrome/browser/ui/cocoa/website_settings/permission_bubble_cocoa.h"
 #import "chrome/browser/ui/cocoa/website_settings/split_block_button.h"
-#include "chrome/browser/ui/website_settings/mock_permission_bubble_request.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/components_strings.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #import "testing/gtest_mac.h"
 #include "ui/base/cocoa/cocoa_base_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/l10n/l10n_util_mac.h"
 #import "ui/events/test/cocoa_test_event_utils.h"
 
 @class ConstrainedWindowButton;
@@ skipping 51 matching lines @@
   }
 
   void TearDown() override {
     [controller_ close];
     chrome::testing::NSRunLoopRunAllPending();
     STLDeleteElements(&requests_);
     CocoaProfileTest::TearDown();
   }
 
   void AddRequest(const std::string& title) {
-    MockPermissionBubbleRequest* request = new MockPermissionBubbleRequest(
+    MockPermissionRequest* request = new MockPermissionRequest(
         title,
         l10n_util::GetStringUTF8(IDS_PERMISSION_ALLOW),
         l10n_util::GetStringUTF8(IDS_PERMISSION_DENY));
     requests_.push_back(request);
   }
 
   NSButton* FindButtonWithTitle(const std::string& title) {
     return FindButtonWithTitle(base::SysUTF8ToNSString(title),
                                [ConstrainedWindowButton class]);
   }
@@ skipping 44 matching lines @@
     NSString* next_title = l10n_util::GetNSString(next_title_id);
     EXPECT_EQ([[menu itemWithTitle:[menu_button title]] state], NSOnState);
     NSMenuItem* next_item = [menu itemWithTitle:next_title];
     EXPECT_EQ([next_item state], NSOffState);
     [menu performActionForItemAtIndex:[menu indexOfItem:next_item]];
   }
 
  protected:
   PermissionBubbleController* controller_;  // Weak;  it deletes itself.
   std::unique_ptr<PermissionBubbleCocoa> bridge_;
-  std::vector<PermissionBubbleRequest*> requests_;
+  std::vector<PermissionRequest*> requests_;
   std::vector<bool> accept_states_;
 };
 
 TEST_F(PermissionBubbleControllerTest, ShowAndClose) {
   EXPECT_FALSE([[controller_ window] isVisible]);
   [controller_ showWindow:nil];
   EXPECT_TRUE([[controller_ window] isVisible]);
 }
 
 TEST_F(PermissionBubbleControllerTest, ShowSinglePermission) {
@@ skipping 226 matching lines @@
     base::mac::ScopedObjCClassSwizzler locationSwizzle(
         [PermissionBubbleController class], [MockBubbleNoLocationBar class],
         @selector(hasVisibleLocationBarForBrowser:));
     withoutLocationBar = [controller_ getExpectedAnchorPoint];
   }
 
   // The bubble should be in different places depending if the location bar is
   // available or not.
   EXPECT_NSNE(withLocationBar, withoutLocationBar);
 }