Rename WebsiteSettings code to PageInfo.

chrome/browser/ui/cocoa/page_info/page_info_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/page_info/website_settings_bubble_controller.h"
+#import "chrome/browser/ui/cocoa/page_info/page_info_bubble_controller.h"
 
 #include <stddef.h>
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/cocoa/test/cocoa_test_helper.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_web_contents_factory.h"
 #include "net/test/test_certificate_data.h"
 #include "testing/gtest_mac.h"
 
-@interface WebsiteSettingsBubbleController (ExposedForTesting)
+@interface PageInfoBubbleController (ExposedForTesting)
 - (NSView*)permissionsView;
 - (NSButton*)resetDecisionsButton;
 - (NSButton*)connectionHelpButton;
 @end
 
-@implementation WebsiteSettingsBubbleController (ExposedForTesting)
+@implementation PageInfoBubbleController (ExposedForTesting)
 - (NSView*)permissionsView {
   return permissionsView_;
 }
 - (NSButton*)resetDecisionsButton {
   return resetDecisionsButton_;
 }
 - (NSButton*)connectionHelpButton {
   return connectionHelpButton_;
 }
 @end
 
 @interface WebsiteSettingsBubbleControllerForTesting

[estark, 2017/03/20 20:19:17]

PageInfoBubbleControllerForTesting?

[lgarron, 2017/03/20 23:09:03]

Seems my search didn't include Objective-C++ files as CPP. Thanks for catching!

-    : WebsiteSettingsBubbleController {
+    : PageInfoBubbleController {
  @private
   CGFloat defaultWindowWidth_;
 }
 @end
 
 @implementation WebsiteSettingsBubbleControllerForTesting
 - (void)setDefaultWindowWidth:(CGFloat)width {
   defaultWindowWidth_ = width;
 }
 - (CGFloat)defaultWindowWidth {
@@ skipping 37 matching lines @@
 class WebsiteSettingsBubbleControllerTest : public CocoaTest {
  public:
   WebsiteSettingsBubbleControllerTest() { controller_ = nil; }
 
   void TearDown() override {
     [controller_ close];
     CocoaTest::TearDown();
   }
 
  protected:
-  WebsiteSettingsUIBridge* bridge_;  // Weak, owned by controller.
+  PageInfoUIBridge* bridge_;  // Weak, owned by controller.
 
   enum MatchType { TEXT_EQUAL = 0, TEXT_NOT_EQUAL };
 
   // Creates a new website settings bubble, with the given default width.
   // If |default_width| is 0, the *default* default width will be used.
   void CreateBubbleWithWidth(CGFloat default_width) {
-    bridge_ = new WebsiteSettingsUIBridge(nullptr);
+    bridge_ = new PageInfoUIBridge(nullptr);
 
     // The controller cleans up after itself when the window closes.
     controller_ = [WebsiteSettingsBubbleControllerForTesting alloc];
     [controller_ setDefaultWindowWidth:default_width];
-    [controller_ initWithParentWindow:test_window()
-              websiteSettingsUIBridge:bridge_
-                          webContents:web_contents_factory_.CreateWebContents(
-                                          &profile_)
-                                  url:GURL("https://www.google.com")];
+    [controller_
+        initWithParentWindow:test_window()
+            PageInfoUIBridge:bridge_
+                 webContents:web_contents_factory_.CreateWebContents(&profile_)
+                         url:GURL("https://www.google.com")];
     window_ = [controller_ window];
     [controller_ showWindow:nil];
   }
 
   void CreateBubble() { CreateBubbleWithWidth(0.0); }
 
   // Return a pointer to the first NSTextField found that either matches, or
   // doesn't match, the given text.
   NSTextField* FindTextField(MatchType match_type, NSString* text) {
     // The window's only immediate child is an invisible view that has a flipped
@@ skipping 32 matching lines @@
     return views;
   }
 
   // Sets up the dialog with some test permission settings.
   void SetTestPermissions() {
     // Create a list of 5 different permissions, corresponding to all the
     // possible settings:
     // - [allow, block, ask] by default
     // - [block, allow] * [by user, by policy, by extension]
     PermissionInfoList permission_info_list;
-    WebsiteSettingsUI::PermissionInfo info;
+    PageInfoUI::PermissionInfo info;
     for (size_t i = 0; i < arraysize(kTestPermissionTypes); ++i) {
       info.type = kTestPermissionTypes[i];
       info.setting = kTestSettings[i];
       if (info.setting == CONTENT_SETTING_DEFAULT)
         info.default_setting = kTestDefaultSettings[i];
       info.source = kTestSettingSources[i];
       info.is_incognito = false;
       permission_info_list.push_back(info);
     }
     ChosenObjectInfoList chosen_object_info_list;
     bridge_->SetPermissionInfo(permission_info_list,
                                std::move(chosen_object_info_list));
   }
 
   content::TestBrowserThreadBundle thread_bundle_;
   TestingProfile profile_;
   content::TestWebContentsFactory web_contents_factory_;
 
   WebsiteSettingsBubbleControllerForTesting* controller_;  // Weak, owns self.
   NSWindow* window_;  // Weak, owned by controller.
 };
 
 TEST_F(WebsiteSettingsBubbleControllerTest, ConnectionHelpButton) {
-  WebsiteSettingsUI::IdentityInfo info;
+  PageInfoUI::IdentityInfo info;
   info.site_identity = std::string("example.com");
-  info.identity_status = WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN;
+  info.identity_status = PageInfo::SITE_IDENTITY_STATUS_UNKNOWN;
 
   CreateBubble();
 
-  bridge_->SetIdentityInfo(const_cast<WebsiteSettingsUI::IdentityInfo&>(info));
+  bridge_->SetIdentityInfo(const_cast<PageInfoUI::IdentityInfo&>(info));
 
   EXPECT_EQ([[controller_ connectionHelpButton] action],
             @selector(openConnectionHelp:));
 }
 
 TEST_F(WebsiteSettingsBubbleControllerTest, ResetDecisionsButton) {
-  WebsiteSettingsUI::IdentityInfo info;
+  PageInfoUI::IdentityInfo info;
   info.site_identity = std::string("example.com");
-  info.identity_status = WebsiteSettings::SITE_IDENTITY_STATUS_UNKNOWN;
+  info.identity_status = PageInfo::SITE_IDENTITY_STATUS_UNKNOWN;
 
   CreateBubble();
 
   // Set identity info, specifying that the button should not be shown.
   info.show_ssl_decision_revoke_button = false;
-  bridge_->SetIdentityInfo(const_cast<WebsiteSettingsUI::IdentityInfo&>(info));
+  bridge_->SetIdentityInfo(const_cast<PageInfoUI::IdentityInfo&>(info));
   EXPECT_EQ([controller_ resetDecisionsButton], nil);
 
   // Set identity info, specifying that the button should be shown.
   info.certificate = net::X509Certificate::CreateFromBytes(
       reinterpret_cast<const char*>(google_der), sizeof(google_der));
   info.show_ssl_decision_revoke_button = true;
-  bridge_->SetIdentityInfo(const_cast<WebsiteSettingsUI::IdentityInfo&>(info));
+  bridge_->SetIdentityInfo(const_cast<PageInfoUI::IdentityInfo&>(info));
   EXPECT_NE([controller_ resetDecisionsButton], nil);
 
   // Check that clicking the button calls the right selector.
   EXPECT_EQ([[controller_ resetDecisionsButton] action],
             @selector(resetCertificateDecisions:));
 
   // Since the bubble is only created once per identity, we only need to check
   // the button is *added* when needed. So we don't check that it's removed
   // when we set an identity with `show_ssl_decision_revoke_button == false`
   // again.
@@ skipping 66 matching lines @@
       }
       if ([view isKindOfClass:[NSPopUpButton class]]) {
         NSPopUpButton* button = static_cast<NSPopUpButton*>(view);
         EXPECT_LT(NSMaxX([button frame]), window_width);
       }
     }
   }
 }
 
 }  // namespace