| Index: chrome/test/chromedriver/chrome/adb_impl.h
|
| diff --git a/chrome/test/chromedriver/chrome/adb_impl.h b/chrome/test/chromedriver/chrome/adb_impl.h
|
| index 043986d3d5906525c701ecfa7b0f3e8cdad98e89..895bd7890436d1b84f06cd1ecfb7289ad4b3b6e8 100644
|
| --- a/chrome/test/chromedriver/chrome/adb_impl.h
|
| +++ b/chrome/test/chromedriver/chrome/adb_impl.h
|
| @@ -23,31 +23,31 @@ class AdbImpl : public Adb {
|
| explicit AdbImpl(
|
| const scoped_refptr<base::SingleThreadTaskRunner>& io_message_loop_proxy,
|
| int port);
|
| - virtual ~AdbImpl();
|
| + ~AdbImpl() override;
|
|
|
| // Overridden from Adb:
|
| - virtual Status GetDevices(std::vector<std::string>* devices) override;
|
| - virtual Status ForwardPort(const std::string& device_serial,
|
| - int local_port,
|
| - const std::string& remote_abstract) override;
|
| - virtual Status SetCommandLineFile(const std::string& device_serial,
|
| - const std::string& command_line_file,
|
| - const std::string& exec_name,
|
| - const std::string& args) override;
|
| - virtual Status CheckAppInstalled(const std::string& device_serial,
|
| - const std::string& package) override;
|
| - virtual Status ClearAppData(const std::string& device_serial,
|
| - const std::string& package) override;
|
| - virtual Status SetDebugApp(const std::string& device_serial,
|
| - const std::string& package) override;
|
| - virtual Status Launch(const std::string& device_serial,
|
| - const std::string& package,
|
| - const std::string& activity) override;
|
| - virtual Status ForceStop(const std::string& device_serial,
|
| + Status GetDevices(std::vector<std::string>* devices) override;
|
| + Status ForwardPort(const std::string& device_serial,
|
| + int local_port,
|
| + const std::string& remote_abstract) override;
|
| + Status SetCommandLineFile(const std::string& device_serial,
|
| + const std::string& command_line_file,
|
| + const std::string& exec_name,
|
| + const std::string& args) override;
|
| + Status CheckAppInstalled(const std::string& device_serial,
|
| const std::string& package) override;
|
| - virtual Status GetPidByName(const std::string& device_serial,
|
| - const std::string& process_name,
|
| - int* pid) override;
|
| + Status ClearAppData(const std::string& device_serial,
|
| + const std::string& package) override;
|
| + Status SetDebugApp(const std::string& device_serial,
|
| + const std::string& package) override;
|
| + Status Launch(const std::string& device_serial,
|
| + const std::string& package,
|
| + const std::string& activity) override;
|
| + Status ForceStop(const std::string& device_serial,
|
| + const std::string& package) override;
|
| + Status GetPidByName(const std::string& device_serial,
|
| + const std::string& process_name,
|
| + int* pid) override;
|
|
|
| private:
|
| Status ExecuteCommand(const std::string& command,
|
|
|