Remove non-virtual variant of StopJob() from UpstartClient

Per request from the owner at CL:1728319. This also makes
upstart_client.cc lint-clean.

BUG=None
TEST=try

Change-Id: I59230caa3f430df72af88ba76154a509621254fb
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1737731Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Reviewed-by: Alice Boxhall <aboxhall@chromium.org>
Commit-Queue: Yusuke Sato <yusukes@chromium.org>
Cr-Commit-Position: refs/heads/master@{#684251}

chrome/browser/chromeos/accessibility/accessibility_manager.cc

@@ -153,7 +153,7 @@ void EnableSwitchAccessAfterChromeVoxMetric(bool val) {
 // brltty.
 void RestartBrltty(const std::string& address) {
   chromeos::UpstartClient* client = chromeos::UpstartClient::Get();
-  client->StopJob(kBrlttyUpstartJobName, EmptyVoidDBusMethodCallback());
+  client->StopJob(kBrlttyUpstartJobName, {}, EmptyVoidDBusMethodCallback());
 
   std::vector<std::string> args;
   if (address.empty())
@@ -1403,7 +1403,7 @@ void AccessibilityManager::PostLoadChromeVox() {
 void AccessibilityManager::PostUnloadChromeVox() {
   // Do any teardown work needed immediately after ChromeVox actually unloads.
   // Stop brltty.
-  chromeos::UpstartClient::Get()->StopJob(kBrlttyUpstartJobName,
+  chromeos::UpstartClient::Get()->StopJob(kBrlttyUpstartJobName, {},
                                           EmptyVoidDBusMethodCallback());
 
   PlayEarcon(SOUND_SPOKEN_FEEDBACK_DISABLED, PlaySoundOption::ALWAYS);

chromeos/dbus/upstart/upstart_client.cc

@@ -4,6 +4,8 @@
 
 #include "chromeos/dbus/upstart/upstart_client.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/memory/weak_ptr.h"
 #include "chromeos/dbus/upstart/fake_upstart_client.h"
@@ -91,11 +93,11 @@ class UpstartClientImpl : public UpstartClient {
   using UpstartClient::StopJob;
 
   void StopMediaAnalytics() override {
-    StopJob(kMediaAnalyticsJob, EmptyVoidDBusMethodCallback());
+    StopJob(kMediaAnalyticsJob, {}, EmptyVoidDBusMethodCallback());
   }
 
   void StopMediaAnalytics(VoidDBusMethodCallback callback) override {
-    StopJob(kMediaAnalyticsJob, std::move(callback));
+    StopJob(kMediaAnalyticsJob, {}, std::move(callback));
   }
 
   void StartWilcoDtcService(VoidDBusMethodCallback callback) override {
@@ -103,7 +105,7 @@ class UpstartClientImpl : public UpstartClient {
   }
 
   void StopWilcoDtcService(VoidDBusMethodCallback callback) override {
-    StopJob(kWilcoDtcDispatcherJob, std::move(callback));
+    StopJob(kWilcoDtcDispatcherJob, {}, std::move(callback));
   }
 
  private:

chromeos/dbus/upstart/upstart_client.h

@@ -68,10 +68,6 @@ class COMPONENT_EXPORT(UPSTART_CLIENT) UpstartClient {
                        const std::vector<std::string>& upstart_env,
                        VoidDBusMethodCallback callback) = 0;
 
-  void StopJob(const std::string& job, VoidDBusMethodCallback callback) {
-    StopJob(job, {}, std::move(callback));
-  }
-
   // Starts authpolicyd.
   virtual void StartAuthPolicyService() = 0;