diff options
author | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 22:05:28 +0000 |
---|---|---|
committer | erg@google.com <erg@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-01 22:05:28 +0000 |
commit | d0af7203fccbb273cd4ee112b12ca93c18441efa (patch) | |
tree | 6410ef23531cf87aac1981a74326ced5a25fa0df /base | |
parent | 7f71e75e4eb1decfdc52f28b2ec48671d09f373b (diff) | |
download | chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.zip chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.tar.gz chromium_src-d0af7203fccbb273cd4ee112b12ca93c18441efa.tar.bz2 |
Revert "FBTF: Another big ctor/dtor cleanup found by automated tools."
This reverts commit 27ea47d65cf8767f350113d5ad9e25170efde811 (r61237).
BUG=none
TEST=compiles
Review URL: http://codereview.chromium.org/3609005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61240 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r-- | base/field_trial.cc | 2 | ||||
-rw-r--r-- | base/field_trial.h | 2 | ||||
-rw-r--r-- | base/global_descriptors_posix.cc | 4 | ||||
-rw-r--r-- | base/global_descriptors_posix.h | 3 |
4 files changed, 2 insertions, 9 deletions
diff --git a/base/field_trial.cc b/base/field_trial.cc index a3e6ac6..3575001 100644 --- a/base/field_trial.cc +++ b/base/field_trial.cc @@ -64,8 +64,6 @@ std::string FieldTrial::MakeName(const std::string& name_prefix, return big_string.append(FieldTrialList::FindFullName(trial_name)); } -FieldTrial::~FieldTrial() {} - //------------------------------------------------------------------------------ // FieldTrialList methods and members. diff --git a/base/field_trial.h b/base/field_trial.h index deee838..b1f0a07 100644 --- a/base/field_trial.h +++ b/base/field_trial.h @@ -119,7 +119,7 @@ class FieldTrial : public base::RefCounted<FieldTrial> { private: friend class base::RefCounted<FieldTrial>; - virtual ~FieldTrial(); + ~FieldTrial() {} // The name of the field trial, as can be found via the FieldTrialList. // This is empty of the trial is not in the experiment. diff --git a/base/global_descriptors_posix.cc b/base/global_descriptors_posix.cc index 8c853a0..869d196 100644 --- a/base/global_descriptors_posix.cc +++ b/base/global_descriptors_posix.cc @@ -11,10 +11,6 @@ namespace base { -GlobalDescriptors::GlobalDescriptors() {} - -GlobalDescriptors::~GlobalDescriptors() {} - int GlobalDescriptors::MaybeGet(Key key) const { for (Mapping::const_iterator i = descriptors_.begin(); i != descriptors_.end(); ++i) { diff --git a/base/global_descriptors_posix.h b/base/global_descriptors_posix.h index 8ea743e..c37dae6 100644 --- a/base/global_descriptors_posix.h +++ b/base/global_descriptors_posix.h @@ -56,8 +56,7 @@ class GlobalDescriptors { } private: - GlobalDescriptors(); - ~GlobalDescriptors(); + GlobalDescriptors() { } friend struct DefaultSingletonTraits<GlobalDescriptors>; Mapping descriptors_; |