summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authordcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 18:01:07 +0000
committerdcheng@chromium.org <dcheng@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-06-13 18:01:07 +0000
commit02c29b3895a09d2b62391e5241fe6f6026cf6a65 (patch)
treece1d6267b281dda2a170d63cbe94bc1fcb32636f /base
parentffd1a1ca3c71d5f651223aa1df0cb0ac9c008971 (diff)
downloadchromium_src-02c29b3895a09d2b62391e5241fe6f6026cf6a65.zip
chromium_src-02c29b3895a09d2b62391e5241fe6f6026cf6a65.tar.gz
chromium_src-02c29b3895a09d2b62391e5241fe6f6026cf6a65.tar.bz2
Rewrite scoped_ptr<T>(NULL) to use the default ctor in base/.
This is the result of running the rewrite_scoped_ptr_ctor_null tool across all files built on Linux in the base/ directory. BUG=173286 Review URL: https://chromiumcodereview.appspot.com/16950008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@206116 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/debug/trace_event_impl.cc1
-rw-r--r--base/memory/scoped_vector_unittest.cc4
-rw-r--r--base/prefs/json_pref_store.cc4
-rw-r--r--base/threading/worker_pool_posix.cc8
4 files changed, 5 insertions, 12 deletions
diff --git a/base/debug/trace_event_impl.cc b/base/debug/trace_event_impl.cc
index 176f67c..ae4fb1e 100644
--- a/base/debug/trace_event_impl.cc
+++ b/base/debug/trace_event_impl.cc
@@ -774,7 +774,6 @@ TraceLog::Options TraceLog::TraceOptionsFromString(const std::string& options) {
TraceLog::TraceLog()
: enable_count_(0),
num_traces_recorded_(0),
- logged_events_(NULL),
dispatching_to_observer_list_(false),
watch_category_(NULL),
trace_options_(RECORD_UNTIL_FULL),
diff --git a/base/memory/scoped_vector_unittest.cc b/base/memory/scoped_vector_unittest.cc
index a91776a..353b52c 100644
--- a/base/memory/scoped_vector_unittest.cc
+++ b/base/memory/scoped_vector_unittest.cc
@@ -61,9 +61,7 @@ enum LifeCycleState {
// Anything more complicated than that should start another test.
class LifeCycleWatcher : public LifeCycleObject::Observer {
public:
- LifeCycleWatcher()
- : life_cycle_state_(LC_INITIAL),
- constructed_life_cycle_object_(NULL) {}
+ LifeCycleWatcher() : life_cycle_state_(LC_INITIAL) {}
virtual ~LifeCycleWatcher() {}
// Assert INITIAL -> CONSTRUCTED and no LifeCycleObject associated with this
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
index 1334abf..e7337a1 100644
--- a/base/prefs/json_pref_store.cc
+++ b/base/prefs/json_pref_store.cc
@@ -157,10 +157,8 @@ JsonPrefStore::JsonPrefStore(const base::FilePath& filename,
prefs_(new DictionaryValue()),
read_only_(false),
writer_(filename, sequenced_task_runner),
- error_delegate_(NULL),
initialized_(false),
- read_error_(PREF_READ_ERROR_OTHER) {
-}
+ read_error_(PREF_READ_ERROR_OTHER) {}
bool JsonPrefStore::GetValue(const std::string& key,
const Value** result) const {
diff --git a/base/threading/worker_pool_posix.cc b/base/threading/worker_pool_posix.cc
index 243e50a..c4c523f 100644
--- a/base/threading/worker_pool_posix.cc
+++ b/base/threading/worker_pool_posix.cc
@@ -123,15 +123,13 @@ bool WorkerPool::RunsTasksOnCurrentThread() {
return g_worker_pool_running_on_this_thread.Get().Get();
}
-PosixDynamicThreadPool::PosixDynamicThreadPool(
- const std::string& name_prefix,
- int idle_seconds_before_exit)
+PosixDynamicThreadPool::PosixDynamicThreadPool(const std::string& name_prefix,
+ int idle_seconds_before_exit)
: name_prefix_(name_prefix),
idle_seconds_before_exit_(idle_seconds_before_exit),
pending_tasks_available_cv_(&lock_),
num_idle_threads_(0),
- terminated_(false),
- num_idle_threads_cv_(NULL) {}
+ terminated_(false) {}
PosixDynamicThreadPool::~PosixDynamicThreadPool() {
while (!pending_tasks_.empty())