Rename WebsiteSettings code to PageInfo.

chrome/browser/ui/page_info/page_info.cc

Index: chrome/browser/ui/page_info/page_info.cc
diff --git a/chrome/browser/ui/page_info/website_settings.cc b/chrome/browser/ui/page_info/page_info.cc
similarity index 93%
rename from chrome/browser/ui/page_info/website_settings.cc
rename to chrome/browser/ui/page_info/page_info.cc
index 61d4cdc1cf00c1c7099cfcbaccd0471777bd713b..6980fa656c7869add9077112ffa17ae8d8f6d6fc 100644
--- a/chrome/browser/ui/page_info/website_settings.cc
+++ b/chrome/browser/ui/page_info/page_info.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/ui/page_info/website_settings.h"
+#include "chrome/browser/ui/page_info/page_info.h"
 
 #include <stddef.h>
 #include <stdint.h>
@@ -39,7 +39,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
 #include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
-#include "chrome/browser/ui/page_info/website_settings_ui.h"
+#include "chrome/browser/ui/page_info/page_info_ui.h"
 #include "chrome/browser/usb/usb_chooser_context.h"
 #include "chrome/browser/usb/usb_chooser_context_factory.h"
 #include "chrome/common/chrome_switches.h"
@@ -75,7 +75,7 @@
 
 #if !defined(OS_ANDROID)
 #include "chrome/browser/ui/exclusive_access/exclusive_access_manager.h"
-#include "chrome/browser/ui/page_info/website_settings_infobar_delegate.h"
+#include "chrome/browser/ui/page_info/page_info_infobar_delegate.h"
 #endif
 
 using base::ASCIIToUTF16;
@@ -163,23 +163,23 @@ void CheckForInsecureContent(const security_state::SecurityInfo& security_info,
 
 void GetSiteIdentityByMaliciousContentStatus(
     security_state::MaliciousContentStatus malicious_content_status,
-    WebsiteSettings::SiteIdentityStatus* status,
+    PageInfo::SiteIdentityStatus* status,
     base::string16* details) {
   switch (malicious_content_status) {
     case security_state::MALICIOUS_CONTENT_STATUS_NONE:
       NOTREACHED();
       break;
     case security_state::MALICIOUS_CONTENT_STATUS_MALWARE:
-      *status = WebsiteSettings::SITE_IDENTITY_STATUS_MALWARE;
+      *status = PageInfo::SITE_IDENTITY_STATUS_MALWARE;
       *details = l10n_util::GetStringUTF16(IDS_PAGEINFO_MALWARE_DETAILS);
       break;
     case security_state::MALICIOUS_CONTENT_STATUS_SOCIAL_ENGINEERING:
-      *status = WebsiteSettings::SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING;
+      *status = PageInfo::SITE_IDENTITY_STATUS_SOCIAL_ENGINEERING;
       *details =
           l10n_util::GetStringUTF16(IDS_PAGEINFO_SOCIAL_ENGINEERING_DETAILS);
       break;
     case security_state::MALICIOUS_CONTENT_STATUS_UNWANTED_SOFTWARE:
-      *status = WebsiteSettings::SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE;
+      *status = PageInfo::SITE_IDENTITY_STATUS_UNWANTED_SOFTWARE;
       *details =
           l10n_util::GetStringUTF16(IDS_PAGEINFO_UNWANTED_SOFTWARE_DETAILS);
       break;
@@ -198,7 +198,7 @@ ChooserContextBase* GetUsbChooserContext(Profile* profile) {
 // The list of chooser types that need to display entries in the Website
 // Settings UI. THE ORDER OF THESE ITEMS IS IMPORTANT. To propose changing it,
 // email security-dev@chromium.org.
-WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = {
+PageInfo::ChooserUIInfo kChooserUIInfo[] = {
     {CONTENT_SETTINGS_TYPE_USB_CHOOSER_DATA, &GetUsbChooserContext,
      IDR_BLOCKED_USB, IDR_ALLOWED_USB, IDS_WEBSITE_SETTINGS_USB_DEVICE_LABEL,
      IDS_WEBSITE_SETTINGS_DELETE_USB_DEVICE, "name"},
@@ -206,13 +206,12 @@ WebsiteSettings::ChooserUIInfo kChooserUIInfo[] = {
 
 }  // namespace
 
-WebsiteSettings::WebsiteSettings(
-    WebsiteSettingsUI* ui,
-    Profile* profile,
-    TabSpecificContentSettings* tab_specific_content_settings,
-    content::WebContents* web_contents,
-    const GURL& url,
-    const security_state::SecurityInfo& security_info)
+PageInfo::PageInfo(PageInfoUI* ui,
+                   Profile* profile,
+                   TabSpecificContentSettings* tab_specific_content_settings,
+                   content::WebContents* web_contents,
+                   const GURL& url,
+                   const security_state::SecurityInfo& security_info)
     : TabSpecificContentSettings::SiteDataObserver(
           tab_specific_content_settings),
       content::WebContentsObserver(web_contents),
@@ -234,15 +233,14 @@ WebsiteSettings::WebsiteSettings(
   PresentSiteData();
   PresentSiteIdentity();
 
-  // Every time the Website Settings UI is opened a |WebsiteSettings| object is
+  // Every time the Website Settings UI is opened a |PageInfo| object is

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

Website Settings => Page Info

   // created. So this counts how ofter the Website Settings UI is opened.

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

ditto

-  RecordWebsiteSettingsAction(WEBSITE_SETTINGS_OPENED);
+  RecordPageInfoAction(WEBSITE_SETTINGS_OPENED);
 }
 
-WebsiteSettings::~WebsiteSettings() {}
+PageInfo::~PageInfo() {}
 
-void WebsiteSettings::RecordWebsiteSettingsAction(
-    WebsiteSettingsAction action) {
+void PageInfo::RecordPageInfoAction(PageInfoAction action) {
   UMA_HISTOGRAM_ENUMERATION("WebsiteSettings.Action", action,
                             WEBSITE_SETTINGS_COUNT);
 
@@ -275,8 +273,8 @@ void WebsiteSettings::RecordWebsiteSettingsAction(
   }
 }
 
-void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
-                                              ContentSetting setting) {
+void PageInfo::OnSitePermissionChanged(ContentSettingsType type,
+                                       ContentSetting setting) {
   // Count how often a permission for a specific content type is changed using
   // the Website Settings UI.
   size_t num_values;
@@ -302,8 +300,8 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
 
   // This is technically redundant given the histogram above, but putting the
   // total count of permission changes in another histogram makes it easier to
-  // compare it against other kinds of actions in WebsiteSettings[PopupView].
-  RecordWebsiteSettingsAction(WEBSITE_SETTINGS_CHANGED_PERMISSION);
+  // compare it against other kinds of actions in PageInfo[PopupView].
+  RecordPageInfoAction(WEBSITE_SETTINGS_CHANGED_PERMISSION);
 
   PermissionUtil::ScopedRevocationReporter scoped_revocation_reporter(
       this->profile_, this->site_url_, this->site_url_, type,
@@ -318,9 +316,8 @@ void WebsiteSettings::OnSitePermissionChanged(ContentSettingsType type,
   PresentSitePermissions();
 }
 
-void WebsiteSettings::OnSiteChosenObjectDeleted(
-    const ChooserUIInfo& ui_info,
-    const base::DictionaryValue& object) {
+void PageInfo::OnSiteChosenObjectDeleted(const ChooserUIInfo& ui_info,
+                                         const base::DictionaryValue& object) {
   // TODO(reillyg): Create metrics for revocations. crbug.com/556845
   ChooserContextBase* context = ui_info.get_context(profile_);
   const GURL origin = site_url_.GetOrigin();
@@ -332,11 +329,11 @@ void WebsiteSettings::OnSiteChosenObjectDeleted(
   PresentSitePermissions();
 }
 
-void WebsiteSettings::OnSiteDataAccessed() {
+void PageInfo::OnSiteDataAccessed() {
   PresentSiteData();
 }
 
-void WebsiteSettings::OnUIClosing() {
+void PageInfo::OnUIClosing() {
 #if defined(OS_ANDROID)
   NOTREACHED();
 #else
@@ -357,15 +354,15 @@ void WebsiteSettings::OnUIClosing() {
 #endif
 }
 
-void WebsiteSettings::OnRevokeSSLErrorBypassButtonPressed() {
+void PageInfo::OnRevokeSSLErrorBypassButtonPressed() {
   DCHECK(chrome_ssl_host_state_delegate_);
   chrome_ssl_host_state_delegate_->RevokeUserAllowExceptionsHard(
       site_url().host());
   did_revoke_user_ssl_decisions_ = true;
 }
 
-void WebsiteSettings::Init(const GURL& url,
-                           const security_state::SecurityInfo& security_info) {
+void PageInfo::Init(const GURL& url,
+                    const security_state::SecurityInfo& security_info) {
 #if !defined(OS_ANDROID) && !defined(OS_IOS)
   // On desktop, internal URLs aren't handled by this class. Instead, a
   // custom and simpler popup is shown.
@@ -635,11 +632,11 @@ void WebsiteSettings::Init(const GURL& url,
   show_ssl_decision_revoke_button_ = delegate->HasAllowException(url.host());
 }
 
-void WebsiteSettings::PresentSitePermissions() {
+void PageInfo::PresentSitePermissions() {
   PermissionInfoList permission_info_list;
   ChosenObjectInfoList chosen_object_info_list;
 
-  WebsiteSettingsUI::PermissionInfo permission_info;
+  PageInfoUI::PermissionInfo permission_info;
   for (size_t i = 0; i < arraysize(kPermissionType); ++i) {
     permission_info.type = kPermissionType[i];
 
@@ -701,8 +698,8 @@ void WebsiteSettings::PresentSitePermissions() {
     auto chosen_objects = context->GetGrantedObjects(origin, origin);
     for (std::unique_ptr<base::DictionaryValue>& object : chosen_objects) {
       chosen_object_info_list.push_back(
-          base::MakeUnique<WebsiteSettingsUI::ChosenObjectInfo>(
-              ui_info, std::move(object)));
+          base::MakeUnique<PageInfoUI::ChosenObjectInfo>(ui_info,
+                                                         std::move(object)));
     }
   }
 
@@ -710,7 +707,7 @@ void WebsiteSettings::PresentSitePermissions() {
                          std::move(chosen_object_info_list));
 }
 
-void WebsiteSettings::PresentSiteData() {
+void PageInfo::PresentSiteData() {
   CookieInfoList cookie_info_list;
   const LocalSharedObjectsContainer& allowed_objects =
       tab_specific_content_settings()->allowed_local_shared_objects();
@@ -718,7 +715,7 @@ void WebsiteSettings::PresentSiteData() {
       tab_specific_content_settings()->blocked_local_shared_objects();
 
   // Add first party cookie and site data counts.
-  WebsiteSettingsUI::CookieInfo cookie_info;
+  PageInfoUI::CookieInfo cookie_info;
   cookie_info.allowed = allowed_objects.GetObjectCountForDomain(site_url_);
   cookie_info.blocked = blocked_objects.GetObjectCountForDomain(site_url_);
   cookie_info.is_first_party = true;
@@ -733,12 +730,12 @@ void WebsiteSettings::PresentSiteData() {
   ui_->SetCookieInfo(cookie_info_list);
 }
 
-void WebsiteSettings::PresentSiteIdentity() {
+void PageInfo::PresentSiteIdentity() {
   // After initialization the status about the site's connection and its
   // identity must be available.
   DCHECK_NE(site_identity_status_, SITE_IDENTITY_STATUS_UNKNOWN);
   DCHECK_NE(site_connection_status_, SITE_CONNECTION_STATUS_UNKNOWN);
-  WebsiteSettingsUI::IdentityInfo info;
+  PageInfoUI::IdentityInfo info;
   if (site_identity_status_ == SITE_IDENTITY_STATUS_EV_CERT)
     info.site_identity = UTF16ToUTF8(organization_name());
   else