Apply automated fixits for Chrome clang plugin to base_unittests.

Working on trimming down ~26k warnings on the Windows clang build.

BUG=467287

Review URL: https://codereview.chromium.org/1092863002

Cr-Commit-Position: refs/heads/master@{#325606}

23 files changed, 80 insertions, 86 deletions

diff --git a/base/async_socket_io_handler.h b/base/async_socket_io_handler.h
index bedb00f..a22c29d 100644
--- a/base/async_socket_io_handler.h
+++ b/base/async_socket_io_handler.h
@@ -76,9 +76,9 @@ class BASE_EXPORT AsyncSocketIoHandler
  private:
 #if defined(OS_WIN)
   // Implementation of IOHandler on Windows.
-  virtual void OnIOCompleted(base::MessageLoopForIO::IOContext* context,
-                             DWORD bytes_transfered,
-                             DWORD error) override;
+  void OnIOCompleted(base::MessageLoopForIO::IOContext* context,
+                     DWORD bytes_transfered,
+                     DWORD error) override;
 #elif defined(OS_POSIX)
   // Implementation of base::MessageLoopForIO::Watcher.
   void OnFileCanWriteWithoutBlocking(int socket) override {}
diff --git a/base/file_version_info_win.h b/base/file_version_info_win.h
index 0e0f271..92d0844 100644
--- a/base/file_version_info_win.h
+++ b/base/file_version_info_win.h
@@ -18,26 +18,26 @@ typedef tagVS_FIXEDFILEINFO VS_FIXEDFILEINFO;
 class FileVersionInfoWin : public FileVersionInfo {
  public:
   BASE_EXPORT FileVersionInfoWin(void* data, WORD language, WORD code_page);
-  BASE_EXPORT ~FileVersionInfoWin();
+  BASE_EXPORT ~FileVersionInfoWin() override;
 
   // Accessors to the different version properties.
   // Returns an empty string if the property is not found.
-  virtual base::string16 company_name() override;
-  virtual base::string16 company_short_name() override;
-  virtual base::string16 product_name() override;
-  virtual base::string16 product_short_name() override;
-  virtual base::string16 internal_name() override;
-  virtual base::string16 product_version() override;
-  virtual base::string16 private_build() override;
-  virtual base::string16 special_build() override;
-  virtual base::string16 comments() override;
-  virtual base::string16 original_filename() override;
-  virtual base::string16 file_description() override;
-  virtual base::string16 file_version() override;
-  virtual base::string16 legal_copyright() override;
-  virtual base::string16 legal_trademarks() override;
-  virtual base::string16 last_change() override;
-  virtual bool is_official_build() override;
+  base::string16 company_name() override;
+  base::string16 company_short_name() override;
+  base::string16 product_name() override;
+  base::string16 product_short_name() override;
+  base::string16 internal_name() override;
+  base::string16 product_version() override;
+  base::string16 private_build() override;
+  base::string16 special_build() override;
+  base::string16 comments() override;
+  base::string16 original_filename() override;
+  base::string16 file_description() override;
+  base::string16 file_version() override;
+  base::string16 legal_copyright() override;
+  base::string16 legal_trademarks() override;
+  base::string16 last_change() override;
+  bool is_official_build() override;
 
   // Lets you access other properties not covered above.
   BASE_EXPORT bool GetValue(const wchar_t* name, std::wstring* value);
diff --git a/base/files/file_path_watcher_win.cc b/base/files/file_path_watcher_win.cc
index f6d0029..d7ce5248 100644
--- a/base/files/file_path_watcher_win.cc
+++ b/base/files/file_path_watcher_win.cc
@@ -27,21 +27,21 @@ class FilePathWatcherImpl : public FilePathWatcher::PlatformDelegate,
         recursive_watch_(false) {}
 
   // FilePathWatcher::PlatformDelegate overrides.
-  virtual bool Watch(const FilePath& path,
-                     bool recursive,
-                     const FilePathWatcher::Callback& callback) override;
-  virtual void Cancel() override;
+  bool Watch(const FilePath& path,
+             bool recursive,
+             const FilePathWatcher::Callback& callback) override;
+  void Cancel() override;
 
   // Deletion of the FilePathWatcher will call Cancel() to dispose of this
   // object in the right thread. This also observes destruction of the required
   // cleanup thread, in case it quits before Cancel() is called.
-  virtual void WillDestroyCurrentMessageLoop() override;
+  void WillDestroyCurrentMessageLoop() override;
 
   // Callback from MessageLoopForIO.
-  virtual void OnObjectSignaled(HANDLE object) override;
+  void OnObjectSignaled(HANDLE object) override;
 
  private:
-  virtual ~FilePathWatcherImpl() {}
+  ~FilePathWatcherImpl() override {}
 
   // Setup a watch handle for directory |dir|. Set |recursive| to true to watch
   // the directory sub trees. Returns true if no fatal error occurs. |handle|
diff --git a/base/logging_win.h b/base/logging_win.h
index 38508a3..aa48e22 100644
--- a/base/logging_win.h
+++ b/base/logging_win.h
@@ -61,8 +61,8 @@ class BASE_EXPORT LogEventProvider : public base::win::EtwTraceProvider {
 
  protected:
   // Overridden to manipulate the log level on ETW control callbacks.
-  virtual void OnEventsEnabled();
-  virtual void OnEventsDisabled();
+  void OnEventsEnabled() override;
+  void OnEventsDisabled() override;
 
  private:
   LogEventProvider();
diff --git a/base/memory/shared_memory_unittest.cc b/base/memory/shared_memory_unittest.cc
index 6e5a4d8..6fe5706 100644
--- a/base/memory/shared_memory_unittest.cc
+++ b/base/memory/shared_memory_unittest.cc
@@ -101,10 +101,10 @@ const char* const MultipleThreadMain::s_test_name_ =
 class MultipleLockThread : public PlatformThread::Delegate {
  public:
   explicit MultipleLockThread(int id) : id_(id) {}
-  virtual ~MultipleLockThread() {}
+  ~MultipleLockThread() override {}
 
   // PlatformThread::Delegate interface.
-  virtual void ThreadMain() override {
+  void ThreadMain() override {
     const uint32 kDataSize = sizeof(int);
     SharedMemoryHandle handle = NULL;
     {
diff --git a/base/message_loop/message_loop_unittest.cc b/base/message_loop/message_loop_unittest.cc
index ccf79c0..ddde6bb 100644
--- a/base/message_loop/message_loop_unittest.cc
+++ b/base/message_loop/message_loop_unittest.cc
@@ -425,7 +425,7 @@ class DispatcherImpl : public MessagePumpDispatcher {
  public:
   DispatcherImpl() : dispatch_count_(0) {}
 
-  virtual uint32_t Dispatch(const NativeEvent& msg) override {
+  uint32_t Dispatch(const NativeEvent& msg) override {
     ::TranslateMessage(&msg);
     ::DispatchMessage(&msg);
     // Do not count WM_TIMER since it is not what we post and it will cause
@@ -489,8 +489,9 @@ class TestIOHandler : public MessageLoopForIO::IOHandler {
  public:
   TestIOHandler(const wchar_t* name, HANDLE signal, bool wait);
 
-  virtual void OnIOCompleted(MessageLoopForIO::IOContext* context,
-                             DWORD bytes_transfered, DWORD error);
+  void OnIOCompleted(MessageLoopForIO::IOContext* context,
+                     DWORD bytes_transfered,
+                     DWORD error) override;
 
   void Init();
   void WaitForIO();
diff --git a/base/message_loop/message_pump_win.h b/base/message_loop/message_pump_win.h
index e2fbd1e..00f1287 100644
--- a/base/message_loop/message_pump_win.h
+++ b/base/message_loop/message_pump_win.h
@@ -114,7 +114,7 @@ class BASE_EXPORT MessagePumpForUI : public MessagePumpWin {
   static const int kMessageFilterCode = 0x5001;
 
   MessagePumpForUI();
-  virtual ~MessagePumpForUI();
+  ~MessagePumpForUI() override;
 
   // MessagePump methods:
   void ScheduleWork() override;
diff --git a/base/process/kill_win.cc b/base/process/kill_win.cc
index aa70f7c..0da3a26 100644
--- a/base/process/kill_win.cc
+++ b/base/process/kill_win.cc
@@ -38,12 +38,12 @@ static const int kWaitInterval = 2000;
 class TimerExpiredTask : public win::ObjectWatcher::Delegate {
  public:
   explicit TimerExpiredTask(Process process);
-  ~TimerExpiredTask();
+  ~TimerExpiredTask() override;
 
   void TimedOut();
 
   // MessageLoop::Watcher -----------------------------------------------------
-  virtual void OnObjectSignaled(HANDLE object);
+  void OnObjectSignaled(HANDLE object) override;
 
  private:
   void KillProcess();
diff --git a/base/sync_socket.h b/base/sync_socket.h
index 4da9d3b..36d6bc1 100644
--- a/base/sync_socket.h
+++ b/base/sync_socket.h
@@ -124,11 +124,11 @@ class BASE_EXPORT CancelableSyncSocket : public SyncSocket {
   // and there isn't a way to cancel a blocking synchronous Read that is
   // supported on <Vista. So, for Windows only, we override these
   // SyncSocket methods in order to support shutting down the 'socket'.
-  virtual bool Close() override;
-  virtual size_t Receive(void* buffer, size_t length) override;
-  virtual size_t ReceiveWithTimeout(void* buffer,
-                                    size_t length,
-                                    TimeDelta timeout) override;
+  bool Close() override;
+  size_t Receive(void* buffer, size_t length) override;
+  size_t ReceiveWithTimeout(void* buffer,
+                            size_t length,
+                            TimeDelta timeout) override;
 #endif
 
   // Send() is overridden to catch cases where the remote end is not responding
diff --git a/base/synchronization/condition_variable_win.cc b/base/synchronization/condition_variable_win.cc
index 6dc4831..5f165c8 100644
--- a/base/synchronization/condition_variable_win.cc
+++ b/base/synchronization/condition_variable_win.cc
@@ -72,12 +72,12 @@ class ConditionVarImpl {
 class WinVistaCondVar: public ConditionVarImpl {
  public:
   WinVistaCondVar(Lock* user_lock);
-  ~WinVistaCondVar() {};
+  ~WinVistaCondVar() override {}
   // Overridden from ConditionVarImpl.
-  virtual void Wait() override;
-  virtual void TimedWait(const TimeDelta& max_time) override;
-  virtual void Broadcast() override;
-  virtual void Signal() override;
+  void Wait() override;
+  void TimedWait(const TimeDelta& max_time) override;
+  void Broadcast() override;
+  void Signal() override;
 
  private:
   base::Lock& user_lock_;
@@ -127,12 +127,12 @@ void WinVistaCondVar::Signal() {
 class WinXPCondVar : public ConditionVarImpl {
  public:
   WinXPCondVar(Lock* user_lock);
-  ~WinXPCondVar();
+  ~WinXPCondVar() override;
   // Overridden from ConditionVarImpl.
-  virtual void Wait() override;
-  virtual void TimedWait(const TimeDelta& max_time) override;
-  virtual void Broadcast() override;
-  virtual void Signal() override;
+  void Wait() override;
+  void TimedWait(const TimeDelta& max_time) override;
+  void Broadcast() override;
+  void Signal() override;
 
   // Define Event class that is used to form circularly linked lists.
   // The list container is an element with NULL as its handle_ value.
diff --git a/base/synchronization/waitable_event_watcher.h b/base/synchronization/waitable_event_watcher.h
index d4d8e77..eb51eff 100644
--- a/base/synchronization/waitable_event_watcher.h
+++ b/base/synchronization/waitable_event_watcher.h
@@ -92,7 +92,7 @@ class BASE_EXPORT WaitableEventWatcher
 
  private:
 #if defined(OS_WIN)
-  virtual void OnObjectSignaled(HANDLE h) override;
+  void OnObjectSignaled(HANDLE h) override;
   win::ObjectWatcher watcher_;
 #else
   // Implementation of MessageLoop::DestructionObserver
diff --git a/base/test/test_reg_util_win_unittest.cc b/base/test/test_reg_util_win_unittest.cc
index 11abe5d..216d58e 100644
--- a/base/test/test_reg_util_win_unittest.cc
+++ b/base/test/test_reg_util_win_unittest.cc
@@ -32,7 +32,7 @@ class RegistryOverrideManagerTest : public testing::Test {
     key.DeleteKey(kTestKeyPath);
   }
 
-  virtual ~RegistryOverrideManagerTest() {
+  ~RegistryOverrideManagerTest() override {
     base::win::RegKey key(HKEY_CURRENT_USER);
     key.DeleteKey(fake_test_key_root_.c_str());
   }
diff --git a/base/trace_event/trace_event_win_unittest.cc b/base/trace_event/trace_event_win_unittest.cc
index 7f1004e..d4dc854 100644
--- a/base/trace_event/trace_event_win_unittest.cc
+++ b/base/trace_event/trace_event_win_unittest.cc
@@ -92,7 +92,7 @@ class TraceEventWinTest: public testing::Test {
   TraceEventWinTest() {
   }
 
-  void SetUp() {
+  void SetUp() override {
     bool is_xp = win::GetVersion() < base::win::VERSION_VISTA;
 
     if (is_xp) {
@@ -151,7 +151,7 @@ class TraceEventWinTest: public testing::Test {
     EXPECT_TRUE(tracelog->IsTracing());
   }
 
-  void TearDown() {
+  void TearDown() override {
     EtwTraceProperties prop;
     if (controller_.session() != 0)
       EXPECT_HRESULT_SUCCEEDED(controller_.Stop(&prop));
diff --git a/base/win/enum_variant.h b/base/win/enum_variant.h
index d978eaa..2caaccd 100644
--- a/base/win/enum_variant.h
+++ b/base/win/enum_variant.h
@@ -39,7 +39,7 @@ class BASE_EXPORT EnumVariant
   STDMETHODIMP Clone(IEnumVARIANT** out_cloned_object) override;
 
  private:
-  ~EnumVariant();
+  ~EnumVariant() override;
 
   scoped_ptr<VARIANT[]> items_;
   unsigned long count_;
diff --git a/base/win/event_trace_consumer_unittest.cc b/base/win/event_trace_consumer_unittest.cc
index 3043152..ecbf238 100644
--- a/base/win/event_trace_consumer_unittest.cc
+++ b/base/win/event_trace_consumer_unittest.cc
@@ -82,7 +82,7 @@ class EtwTraceConsumerBaseTest: public testing::Test {
       : session_name_(StringPrintf(L"TestSession-%d", GetCurrentProcId())) {
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     // Cleanup any potentially dangling sessions.
     EtwTraceProperties ignore;
     EtwTraceController::Stop(session_name_.c_str(), &ignore);
@@ -91,7 +91,7 @@ class EtwTraceConsumerBaseTest: public testing::Test {
     ASSERT_HRESULT_SUCCEEDED(::CoCreateGuid(&test_provider_));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     // Cleanup any potentially dangling sessions.
     EtwTraceProperties ignore;
     EtwTraceController::Stop(session_name_.c_str(), &ignore);
@@ -125,13 +125,13 @@ namespace {
 
 class EtwTraceConsumerRealtimeTest: public EtwTraceConsumerBaseTest {
  public:
-  virtual void SetUp() {
+  void SetUp() override {
     EtwTraceConsumerBaseTest::SetUp();
     ASSERT_HRESULT_SUCCEEDED(
         consumer_.OpenRealtimeSession(session_name_.c_str()));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     consumer_.Close();
     EtwTraceConsumerBaseTest::TearDown();
   }
@@ -261,7 +261,7 @@ class EtwTraceConsumerDataTest: public EtwTraceConsumerBaseTest {
   EtwTraceConsumerDataTest() {
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     EtwTraceConsumerBaseTest::SetUp();
 
     EtwTraceProperties prop;
@@ -273,7 +273,7 @@ class EtwTraceConsumerDataTest: public EtwTraceConsumerBaseTest {
     temp_file_ = temp_dir_.path().Append(L"test.etl");
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     EXPECT_TRUE(base::DeleteFile(temp_file_, false));
 
     EtwTraceConsumerBaseTest::TearDown();
diff --git a/base/win/event_trace_controller_unittest.cc b/base/win/event_trace_controller_unittest.cc
index be11128..a2cd81c 100644
--- a/base/win/event_trace_controller_unittest.cc
+++ b/base/win/event_trace_controller_unittest.cc
@@ -42,12 +42,8 @@ class TestingProvider: public EtwTraceProvider {
   }
 
  private:
-  virtual void OnEventsEnabled() {
-    ::SetEvent(callback_event_.Get());
-  }
-  virtual void PostEventsDisabled() {
-    ::SetEvent(callback_event_.Get());
-  }
+  void OnEventsEnabled() override { ::SetEvent(callback_event_.Get()); }
+  void PostEventsDisabled() override { ::SetEvent(callback_event_.Get()); }
 
   ScopedHandle callback_event_;
 
@@ -113,7 +109,7 @@ class EtwTraceControllerTest : public testing::Test {
       : session_name_(StringPrintf(L"TestSession-%d", GetCurrentProcId())) {
   }
 
-  virtual void SetUp() {
+  void SetUp() override {
     EtwTraceProperties ignore;
     EtwTraceController::Stop(session_name_.c_str(), &ignore);
 
@@ -121,7 +117,7 @@ class EtwTraceControllerTest : public testing::Test {
     ASSERT_HRESULT_SUCCEEDED(::CoCreateGuid(&test_provider_));
   }
 
-  virtual void TearDown() {
+  void TearDown() override {
     EtwTraceProperties prop;
     EtwTraceController::Stop(session_name_.c_str(), &prop);
   }
diff --git a/base/win/iunknown_impl.h b/base/win/iunknown_impl.h
index 4283d02..b7de205 100644
--- a/base/win/iunknown_impl.h
+++ b/base/win/iunknown_impl.h
@@ -19,11 +19,11 @@ class BASE_EXPORT IUnknownImpl : public IUnknown {
  public:
   IUnknownImpl();
 
-  virtual ULONG STDMETHODCALLTYPE AddRef() override;
-  virtual ULONG STDMETHODCALLTYPE Release() override;
+  ULONG STDMETHODCALLTYPE AddRef() override;
+  ULONG STDMETHODCALLTYPE Release() override;
 
   // Subclasses should extend this to return any interfaces they provide.
-  virtual STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override;
+  STDMETHODIMP QueryInterface(REFIID riid, void** ppv) override;
 
  protected:
   virtual ~IUnknownImpl();
diff --git a/base/win/iunknown_impl_unittest.cc b/base/win/iunknown_impl_unittest.cc
index db86214..874a43a 100644
--- a/base/win/iunknown_impl_unittest.cc
+++ b/base/win/iunknown_impl_unittest.cc
@@ -15,9 +15,7 @@ class TestIUnknownImplSubclass : public IUnknownImpl {
   TestIUnknownImplSubclass() {
     ++instance_count;
   }
-  virtual ~TestIUnknownImplSubclass() {
-    --instance_count;
-  }
+  ~TestIUnknownImplSubclass() override { --instance_count; }
   static int instance_count;
 };
 
diff --git a/base/win/object_watcher_unittest.cc b/base/win/object_watcher_unittest.cc
index 1a5e9e2..b30ca41 100644
--- a/base/win/object_watcher_unittest.cc
+++ b/base/win/object_watcher_unittest.cc
@@ -17,7 +17,7 @@ namespace {
 
 class QuitDelegate : public ObjectWatcher::Delegate {
  public:
-  virtual void OnObjectSignaled(HANDLE object) {
+  void OnObjectSignaled(HANDLE object) override {
     MessageLoop::current()->QuitWhenIdle();
   }
 };
@@ -26,9 +26,8 @@ class DecrementCountDelegate : public ObjectWatcher::Delegate {
  public:
   explicit DecrementCountDelegate(int* counter) : counter_(counter) {
   }
-  virtual void OnObjectSignaled(HANDLE object) {
-    --(*counter_);
-  }
+  void OnObjectSignaled(HANDLE object) override { --(*counter_); }
+
  private:
   int* counter_;
 };
diff --git a/base/win/pe_image.h b/base/win/pe_image.h
index 5cef537..343d286 100644
--- a/base/win/pe_image.h
+++ b/base/win/pe_image.h
@@ -238,7 +238,7 @@ class PEImageAsData : public PEImage {
  public:
   explicit PEImageAsData(HMODULE hModule) : PEImage(hModule) {}
 
-  virtual PVOID RVAToAddr(DWORD rva) const;
+  PVOID RVAToAddr(DWORD rva) const override;
 };
 
 inline bool PEImage::IsOrdinal(LPCSTR name) {
diff --git a/base/win/registry.cc b/base/win/registry.cc
index d0df48a..47afcbf 100644
--- a/base/win/registry.cc
+++ b/base/win/registry.cc
@@ -38,7 +38,7 @@ const REGSAM kWow64AccessMask = KEY_WOW64_32KEY | KEY_WOW64_64KEY;
 class RegKey::Watcher : public ObjectWatcher::Delegate {
  public:
   explicit Watcher(RegKey* owner) : owner_(owner) {}
-  ~Watcher() {}
+  ~Watcher() override {}
 
   bool StartWatching(HKEY key, const ChangeCallback& callback);
 
diff --git a/base/win/registry_unittest.cc b/base/win/registry_unittest.cc
index 6548474..2257663 100644
--- a/base/win/registry_unittest.cc
+++ b/base/win/registry_unittest.cc
@@ -31,7 +31,7 @@ class RegistryTest : public testing::Test {
 #endif  //  _WIN64
 
   RegistryTest() {}
-  virtual void SetUp() override {
+  void SetUp() override {
     // Create a temporary key.
     RegKey key(HKEY_CURRENT_USER, L"", KEY_ALL_ACCESS);
     key.DeleteKey(kRootKey);
@@ -42,7 +42,7 @@ class RegistryTest : public testing::Test {
     foo_software_key_ += L"\\Foo";
   }
 
-  virtual void TearDown() override {
+  void TearDown() override {
     // Clean up the temporary key.
     RegKey key(HKEY_CURRENT_USER, L"", KEY_SET_VALUE);
     ASSERT_EQ(ERROR_SUCCESS, key.DeleteKey(kRootKey));
diff --git a/base/win/shortcut_unittest.cc b/base/win/shortcut_unittest.cc
index 4bb227a..794be23 100644
--- a/base/win/shortcut_unittest.cc
+++ b/base/win/shortcut_unittest.cc
@@ -25,7 +25,7 @@ static const char kFileContents2[] = "This is another target.";
 
 class ShortcutTest : public testing::Test {
  protected:
-  virtual void SetUp() override {
+  void SetUp() override {
     ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
     ASSERT_TRUE(temp_dir_2_.CreateUniqueTempDir());