diff options
| author | Jeremy Roman <jbroman@chromium.org> | 2019-08-12 15:45:27 +0000 |
|---|---|---|
| committer | Commit Bot <commit-bot@chromium.org> | 2019-08-12 15:45:27 +0000 |
| commit | 26105523c296886e736ca07d0a0825f38d646cc0 (patch) | |
| tree | f535637a05e3e106f07ce91639b3ab11ea3714b7 /google | |
| parent | ddd7b06cf8c34e638643f7ce888bfc7c56e96933 (diff) | |
| download | zlib-26105523c296886e736ca07d0a0825f38d646cc0.tar.gz | |
Use in-class initializers for base::WeakPtrFactory (all remaining uses on Linux desktop).
Changed NULL to nullptr where the presubmit complained (due to new line wrapping).
Generated by: https://chromium-review.googlesource.com/c/chromium/src/+/1689216
Bug: 981415
Tbr: johannes@chromium.org,mathp@chromium.org,satorux@chromium.org
Change-Id: Icd574b69f75ead6dc6f34e7b4edcd52a53830640
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1702744
Reviewed-by: Jeremy Roman <jbroman@chromium.org>
Reviewed-by: Mihai Sardarescu <msarda@chromium.org>
Reviewed-by: Raymes Khoury <raymes@chromium.org>
Reviewed-by: Gabriel Charette <gab@chromium.org>
Reviewed-by: Sergey Ulanov <sergeyu@chromium.org>
Reviewed-by: Yuwei Huang <yuweih@chromium.org>
Reviewed-by: Reilly Grant <reillyg@chromium.org>
Reviewed-by: Ken Rockot <rockot@google.com>
Reviewed-by: Marc Treib <treib@chromium.org>
Reviewed-by: Rayan Kanso <rayankans@chromium.org>
Reviewed-by: Victor Costan <pwnall@chromium.org>
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Jeremy Roman <jbroman@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#686003}
Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src
Cr-Mirrored-Commit: 7c5cfabd6bc582c20e0ae5e56adf8e9c8e22bce0
Diffstat (limited to 'google')
| -rw-r--r-- | google/zip_reader.cc | 3 | ||||
| -rw-r--r-- | google/zip_reader.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/google/zip_reader.cc b/google/zip_reader.cc index 63d2319..6bba0cf 100644 --- a/google/zip_reader.cc +++ b/google/zip_reader.cc @@ -134,8 +134,7 @@ ZipReader::EntryInfo::EntryInfo(const std::string& file_name_in_zip, last_modified_ = base::Time::UnixEpoch(); } -ZipReader::ZipReader() - : weak_ptr_factory_(this) { +ZipReader::ZipReader() { Reset(); } diff --git a/google/zip_reader.h b/google/zip_reader.h index aacffda..7a43d3a 100644 --- a/google/zip_reader.h +++ b/google/zip_reader.h @@ -224,7 +224,7 @@ class ZipReader { bool reached_end_; std::unique_ptr<EntryInfo> current_entry_info_; - base::WeakPtrFactory<ZipReader> weak_ptr_factory_; + base::WeakPtrFactory<ZipReader> weak_ptr_factory_{this}; DISALLOW_COPY_AND_ASSIGN(ZipReader); }; |