Rename WebsiteSettings code to PageInfo.

chrome/browser/ui/views/page_info/page_info_popup_view_interactive_uitest.cc

Index: chrome/browser/ui/views/page_info/page_info_popup_view_interactive_uitest.cc
diff --git a/chrome/browser/ui/views/page_info/website_settings_popup_view_interactive_uitest.cc b/chrome/browser/ui/views/page_info/page_info_popup_view_interactive_uitest.cc
similarity index 76%
rename from chrome/browser/ui/views/page_info/website_settings_popup_view_interactive_uitest.cc
rename to chrome/browser/ui/views/page_info/page_info_popup_view_interactive_uitest.cc
index 822c1c29d6feb7dc4e4f1a9eeebcf3b60837021e..0427493f21e18f6f72fe5998cdef827c6bf65f61 100644
--- a/chrome/browser/ui/views/page_info/website_settings_popup_view_interactive_uitest.cc
+++ b/chrome/browser/ui/views/page_info/page_info_popup_view_interactive_uitest.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/views/page_info/website_settings_popup_view.h"
+#include "chrome/browser/ui/views/page_info/page_info_popup_view.h"
 
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ -33,15 +33,15 @@ void ClickAndWait(Browser* browser) {
 
 IN_PROC_BROWSER_TEST_F(WebSiteSettingsPopupViewBrowserTest, ShowPopup) {

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

I think test fixtures should be renamed as well; it's common for people to run
tests for the class named Blah with --gtest_filter="*Blah*".

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

Okay, will do a pass for those.

[lgarron, 2017/03/24 05:55:20]

Turns out the reason I missed this is because
WebSiteSettingsPopupViewBrowserTest is the only instance that capitalizes
"WebsiteSettings" as "WebSiteSettings". I've done a case-sensitive search to
confirm there are no others.

   ClickAndWait(browser());
-  EXPECT_EQ(WebsiteSettingsPopupView::POPUP_WEBSITE_SETTINGS,
-            WebsiteSettingsPopupView::GetShownPopupType());
+  EXPECT_EQ(PageInfoPopupView::POPUP_WEBSITE_SETTINGS,
+            PageInfoPopupView::GetShownPopupType());
 }
 
 IN_PROC_BROWSER_TEST_F(WebSiteSettingsPopupViewBrowserTest, ChromeURL) {
   ui_test_utils::NavigateToURL(browser(), GURL("chrome://settings"));
   ClickAndWait(browser());
-  EXPECT_EQ(WebsiteSettingsPopupView::POPUP_INTERNAL_PAGE,
-            WebsiteSettingsPopupView::GetShownPopupType());
+  EXPECT_EQ(PageInfoPopupView::POPUP_INTERNAL_PAGE,
+            PageInfoPopupView::GetShownPopupType());
 }
 
 IN_PROC_BROWSER_TEST_F(WebSiteSettingsPopupViewBrowserTest,
@@ -49,24 +49,24 @@ IN_PROC_BROWSER_TEST_F(WebSiteSettingsPopupViewBrowserTest,
   ui_test_utils::NavigateToURL(
       browser(), GURL("chrome-extension://extension-id/options.html"));
   ClickAndWait(browser());
-  EXPECT_EQ(WebsiteSettingsPopupView::POPUP_INTERNAL_PAGE,
-            WebsiteSettingsPopupView::GetShownPopupType());
+  EXPECT_EQ(PageInfoPopupView::POPUP_INTERNAL_PAGE,
+            PageInfoPopupView::GetShownPopupType());
 }
 
 IN_PROC_BROWSER_TEST_F(WebSiteSettingsPopupViewBrowserTest, ChromeDevtoolsURL) {
   ui_test_utils::NavigateToURL(
       browser(), GURL("chrome-devtools://devtools/bundled/inspector.html"));
   ClickAndWait(browser());
-  EXPECT_EQ(WebsiteSettingsPopupView::POPUP_INTERNAL_PAGE,
-            WebsiteSettingsPopupView::GetShownPopupType());
+  EXPECT_EQ(PageInfoPopupView::POPUP_INTERNAL_PAGE,
+            PageInfoPopupView::GetShownPopupType());
 }
 
 IN_PROC_BROWSER_TEST_F(WebSiteSettingsPopupViewBrowserTest, ViewSourceURL) {
   ui_test_utils::NavigateToURL(browser(), GURL("about:blank"));
   chrome::ViewSelectedSource(browser());
   ClickAndWait(browser());
-  EXPECT_EQ(WebsiteSettingsPopupView::POPUP_INTERNAL_PAGE,
-            WebsiteSettingsPopupView::GetShownPopupType());
+  EXPECT_EQ(PageInfoPopupView::POPUP_INTERNAL_PAGE,
+            PageInfoPopupView::GetShownPopupType());
 }
 
 }  // namespace