Remove Param postfix from the browser test virtual state getters

FileManagerBrowserTest is a parametric test: none of the other browser
tests are (Gallery, VideoPlayer, AudioPlayer).

Having the Param postfix in the getter names is a leftover from a time
when there was only FileManagerBrowserTest. Remove the Param postfix.

Bonus points: the implementation details of the test extension browser
tests is no longer exposed. FileManageBrowserTestBase does not need to
know, nor does it care.

Bug: 833834
Change-Id: I3919b3751122afdccd1f6f0689107ab91440c427
Reviewed-on: https://chromium-review.googlesource.com/1042426Reviewed-by: Stuart Langley <slangley@chromium.org>
Commit-Queue: Noel Gordon <noel@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555907}

chrome/browser/chromeos/file_manager/audio_player_browsertest.cc

@@ -9,9 +9,9 @@ namespace file_manager {
 template <GuestMode MODE>
 class AudioPlayerBrowserTestBase : public FileManagerBrowserTestBase {
  public:
-  GuestMode GetGuestModeParam() const override { return MODE; }
+  GuestMode GetGuestMode() const override { return MODE; }
 
-  const char* GetTestCaseNameParam() const override {
+  const char* GetTestCaseName() const override {
     return test_case_name_.c_str();
   }
 

chrome/browser/chromeos/file_manager/file_manager_browsertest.cc

@@ -36,11 +36,11 @@ class FileManagerBrowserTest :
     }
   }
 
-  GuestMode GetGuestModeParam() const override {
+  GuestMode GetGuestMode() const override {
     return std::get<0>(GetParam());
   }
 
-  const char* GetTestCaseNameParam() const override {
+  const char* GetTestCaseName() const override {
     return std::get<1>(GetParam());
   }
 
@@ -50,7 +50,7 @@ class FileManagerBrowserTest :
 
  private:
   bool shouldEnableLegacyEventDispatch() {
-    const std::string test_case_name = GetTestCaseNameParam();
+    const std::string test_case_name = GetTestCaseName();
     // crbug.com/482121 crbug.com/480491
     return test_case_name.find("tabindex") != std::string::npos;
   }
@@ -639,9 +639,9 @@ class MultiProfileFileManagerBrowserTest : public FileManagerBrowserTestBase {
                                                  "refresh_token");
   }
 
-  GuestMode GetGuestModeParam() const override { return NOT_IN_GUEST_MODE; }
+  GuestMode GetGuestMode() const override { return NOT_IN_GUEST_MODE; }
 
-  const char* GetTestCaseNameParam() const override {
+  const char* GetTestCaseName() const override {
     return test_case_name_.c_str();
   }
 

chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc

@@ -536,13 +536,13 @@ void FileManagerBrowserTestBase::SetUp() {
 
 void FileManagerBrowserTestBase::SetUpCommandLine(
     base::CommandLine* command_line) {
-  if (GetGuestModeParam() == IN_GUEST_MODE) {
+  if (GetGuestMode() == IN_GUEST_MODE) {
     command_line->AppendSwitch(chromeos::switches::kGuestSession);
     command_line->AppendSwitchNative(chromeos::switches::kLoginUser, "");
     command_line->AppendSwitch(switches::kIncognito);
   }
 
-  if (GetGuestModeParam() == IN_INCOGNITO) {
+  if (GetGuestMode() == IN_INCOGNITO) {
     command_line->AppendSwitch(switches::kIncognito);
   }
 
@@ -554,7 +554,7 @@ void FileManagerBrowserTestBase::SetUpInProcessBrowserTestFixture() {
 
   local_volume_.reset(new DownloadsTestVolume);
 
-  if (GetGuestModeParam() != IN_GUEST_MODE) {
+  if (GetGuestMode() != IN_GUEST_MODE) {
     create_drive_integration_service_ =
         base::Bind(&FileManagerBrowserTestBase::CreateDriveIntegrationService,
                    base::Unretained(this));
@@ -570,7 +570,7 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() {
 
   CHECK(local_volume_->Mount(profile()));
 
-  if (GetGuestModeParam() != IN_GUEST_MODE) {
+  if (GetGuestMode() != IN_GUEST_MODE) {
     // Start the embedded test server to serve the mocked share dialog.
     CHECK(embedded_test_server()->Start());
     const GURL share_url_base(embedded_test_server()->GetURL(
@@ -604,7 +604,7 @@ void FileManagerBrowserTestBase::SetUpOnMainThread() {
 }
 
 void FileManagerBrowserTestBase::StartTest() {
-  LOG(INFO) << "FileManagerBrowserTest::StartTest " << GetTestCaseNameParam();
+  LOG(INFO) << "FileManagerBrowserTest::StartTest " << GetTestCaseName();
   static const base::FilePath test_extension_dir =
       base::FilePath(FILE_PATH_LITERAL("ui/file_manager/integration_tests"));
   LaunchExtension(test_extension_dir, GetTestExtensionManifestName());
@@ -654,7 +654,7 @@ void FileManagerBrowserTestBase::RunTestMessageLoop() {
     }
 
     // Test FAILED: while processing the command.
-    LOG(INFO) << "[FAILED] " << GetTestCaseNameParam();
+    LOG(INFO) << "[FAILED] " << GetTestCaseName();
     return;
   }
 }
@@ -666,7 +666,7 @@ void FileManagerBrowserTestBase::OnCommand(const std::string& name,
 
   if (name == "getTestName") {
     // Obtain the test case name.
-    *output = GetTestCaseNameParam();
+    *output = GetTestCaseName();
     return;
   }
 
@@ -686,7 +686,7 @@ void FileManagerBrowserTestBase::OnCommand(const std::string& name,
 
   if (name == "isInGuestMode") {
     // Obtain whether the test is in guest mode or not.
-    *output = GetGuestModeParam() != NOT_IN_GUEST_MODE ? "true" : "false";
+    *output = GetGuestMode() != NOT_IN_GUEST_MODE ? "true" : "false";
     return;
   }
 

chrome/browser/chromeos/file_manager/file_manager_browsertest_base.h

@@ -50,8 +50,8 @@ class FileManagerBrowserTestBase : public ExtensionApiTest {
   void StartTest();
 
   // Overrides for each FileManagerBrowserTest test extension type.
-  virtual GuestMode GetGuestModeParam() const = 0;
-  virtual const char* GetTestCaseNameParam() const = 0;
+  virtual GuestMode GetGuestMode() const = 0;
+  virtual const char* GetTestCaseName() const = 0;
   virtual const char* GetTestExtensionManifestName() const = 0;
 
  private:

chrome/browser/chromeos/file_manager/gallery_browsertest.cc

@@ -9,9 +9,9 @@ namespace file_manager {
 template <GuestMode MODE>
 class GalleryBrowserTestBase : public FileManagerBrowserTestBase {
  public:
-  GuestMode GetGuestModeParam() const override { return MODE; }
+  GuestMode GetGuestMode() const override { return MODE; }
 
-  const char* GetTestCaseNameParam() const override {
+  const char* GetTestCaseName() const override {
     return test_case_name_.c_str();
   }
 

chrome/browser/chromeos/file_manager/video_player_browsertest.cc

@@ -17,9 +17,9 @@ class VideoPlayerBrowserTestBase : public FileManagerBrowserTestBase {
     FileManagerBrowserTestBase::SetUpCommandLine(command_line);
   }
 
-  GuestMode GetGuestModeParam() const override { return MODE; }
+  GuestMode GetGuestMode() const override { return MODE; }
 
-  const char* GetTestCaseNameParam() const override {
+  const char* GetTestCaseName() const override {
     return test_case_name_.c_str();
   }