| Index: chrome/test/chromedriver/performance_logger_unittest.cc
|
| diff --git a/chrome/test/chromedriver/performance_logger_unittest.cc b/chrome/test/chromedriver/performance_logger_unittest.cc
|
| index 51ebf1c882e0bdd52ded0b115b118eb619b8afa9..190fb5e9682b2ee4f6c8b661987e7ad44ca8c67a 100644
|
| --- a/chrome/test/chromedriver/performance_logger_unittest.cc
|
| +++ b/chrome/test/chromedriver/performance_logger_unittest.cc
|
| @@ -35,7 +35,7 @@ class FakeDevToolsClient : public StubDevToolsClient {
|
| public:
|
| explicit FakeDevToolsClient(const std::string& id)
|
| : id_(id), listener_(NULL), command_index_(0) {}
|
| - virtual ~FakeDevToolsClient() {}
|
| + ~FakeDevToolsClient() override {}
|
|
|
| bool PopSentCommand(DevToolsCommand** out_command) {
|
| if (sent_commands_.size() > command_index_) {
|
| @@ -56,11 +56,9 @@ class FakeDevToolsClient : public StubDevToolsClient {
|
| }
|
|
|
| // Overridden from DevToolsClient:
|
| - virtual Status ConnectIfNecessary() override {
|
| - return listener_->OnConnected(this);
|
| - }
|
| + Status ConnectIfNecessary() override { return listener_->OnConnected(this); }
|
|
|
| - virtual Status SendCommandAndGetResult(
|
| + Status SendCommandAndGetResult(
|
| const std::string& method,
|
| const base::DictionaryValue& params,
|
| scoped_ptr<base::DictionaryValue>* result) override {
|
| @@ -69,14 +67,12 @@ class FakeDevToolsClient : public StubDevToolsClient {
|
| return Status(kOk);
|
| }
|
|
|
| - virtual void AddListener(DevToolsEventListener* listener) override {
|
| + void AddListener(DevToolsEventListener* listener) override {
|
| CHECK(!listener_);
|
| listener_ = listener;
|
| }
|
|
|
| - virtual const std::string& GetId() override {
|
| - return id_;
|
| - }
|
| + const std::string& GetId() override { return id_; }
|
|
|
| private:
|
| const std::string id_; // WebView id.
|
| @@ -100,10 +96,10 @@ struct LogEntry {
|
|
|
| class FakeLog : public Log {
|
| public:
|
| - virtual void AddEntryTimestamped(const base::Time& timestamp,
|
| - Level level,
|
| - const std::string& source,
|
| - const std::string& message) override;
|
| + void AddEntryTimestamped(const base::Time& timestamp,
|
| + Level level,
|
| + const std::string& source,
|
| + const std::string& message) override;
|
|
|
| const ScopedVector<LogEntry>& GetEntries() {
|
| return entries_;
|
| @@ -253,16 +249,15 @@ class FakeBrowserwideClient : public FakeDevToolsClient {
|
| FakeBrowserwideClient()
|
| : FakeDevToolsClient(DevToolsClientImpl::kBrowserwideDevToolsClientId),
|
| events_handled_(false) {}
|
| - virtual ~FakeBrowserwideClient() {}
|
| + ~FakeBrowserwideClient() override {}
|
|
|
| bool events_handled() const {
|
| return events_handled_;
|
| }
|
|
|
| // Overridden from DevToolsClient:
|
| - virtual Status HandleEventsUntil(
|
| - const ConditionalFunc& conditional_func,
|
| - const base::TimeDelta& timeout) override {
|
| + Status HandleEventsUntil(const ConditionalFunc& conditional_func,
|
| + const base::TimeDelta& timeout) override {
|
| TriggerEvent("Tracing.tracingComplete");
|
| events_handled_ = true;
|
| return Status(kOk);
|
|
|