| Index: chrome/browser/chromeos/system_logs/system_logs_fetcher_base.cc
|
| diff --git a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc b/chrome/browser/chromeos/system_logs/system_logs_fetcher_base.cc
|
| similarity index 64%
|
| rename from chrome/browser/chromeos/system_logs/system_logs_fetcher.cc
|
| rename to chrome/browser/chromeos/system_logs/system_logs_fetcher_base.cc
|
| index e34c06dd11cf4fccffc73bc24cccd26c4f20e28a..f23775c080a26607a6e9023731bc1311a9234ead 100644
|
| --- a/chrome/browser/chromeos/system_logs/system_logs_fetcher.cc
|
| +++ b/chrome/browser/chromeos/system_logs/system_logs_fetcher_base.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "chrome/browser/chromeos/system_logs/system_logs_fetcher.h"
|
| +#include "chrome/browser/chromeos/system_logs/system_logs_fetcher_base.h"
|
|
|
| #include "base/bind.h"
|
| #include "base/bind_helpers.h"
|
| @@ -20,40 +20,26 @@ using content::BrowserThread;
|
|
|
| namespace chromeos {
|
|
|
| -SystemLogsFetcher::SystemLogsFetcher()
|
| +SystemLogsFetcherBase::SystemLogsFetcherBase()
|
| : response_(new SystemLogsResponse),
|
| - num_pending_requests_(0),
|
| - weak_ptr_factory_(this) {
|
| - // Debug Daemon data source.
|
| - data_sources_.push_back(new DebugDaemonLogSource());
|
| -
|
| - // Chrome data sources.
|
| - data_sources_.push_back(new ChromeInternalLogSource());
|
| - data_sources_.push_back(new CommandLineLogSource());
|
| - data_sources_.push_back(new DBusLogSource());
|
| - data_sources_.push_back(new LsbReleaseLogSource());
|
| - data_sources_.push_back(new MemoryDetailsLogSource());
|
| - data_sources_.push_back(new NetworkEventLogSource());
|
| - data_sources_.push_back(new TouchLogSource());
|
| -
|
| - num_pending_requests_ = data_sources_.size();
|
| + num_pending_requests_(0) {
|
| }
|
|
|
| -SystemLogsFetcher::~SystemLogsFetcher() {}
|
| +SystemLogsFetcherBase::~SystemLogsFetcherBase() {}
|
|
|
| -void SystemLogsFetcher::Fetch(const SysLogsFetcherCallback& callback) {
|
| +void SystemLogsFetcherBase::Fetch(const SysLogsFetcherCallback& callback) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
| DCHECK(callback_.is_null());
|
| DCHECK(!callback.is_null());
|
|
|
| callback_ = callback;
|
| for (size_t i = 0; i < data_sources_.size(); ++i) {
|
| - data_sources_[i]->Fetch(base::Bind(&SystemLogsFetcher::AddResponse,
|
| - weak_ptr_factory_.GetWeakPtr()));
|
| + data_sources_[i]->Fetch(base::Bind(&SystemLogsFetcherBase::AddResponse,
|
| + GetWeakPtr()));
|
| }
|
| }
|
|
|
| -void SystemLogsFetcher::AddResponse(SystemLogsResponse* response) {
|
| +void SystemLogsFetcherBase::AddResponse(SystemLogsResponse* response) {
|
| DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
|
|
|
| for (SystemLogsResponse::const_iterator it = response->begin();
|
|
|