diff options
| author | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
|---|---|---|
| committer | erg@chromium.org <erg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-15 17:23:23 +0000 |
| commit | 5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b (patch) | |
| tree | 4df72d2d3125b017df6fd3286d331a5fcd8498a4 /app | |
| parent | 7f041050fd817116b78aa09227f511cc6505d7f3 (diff) | |
| download | chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.zip chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.gz chromium_src-5097dc8cf47eb60b3284db2ccf3c1e645c6d8b7b.tar.bz2 | |
Attempt four at landing the "histogram.h removed from message_loop.h" patch.
Previously committed as r52349 and r52336. Related commits: r52367, r52364
and r52343.
Rerunning trybots due to previous trybot breakage.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/2965015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52496 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
| -rw-r--r-- | app/animation_container_unittest.cc | 3 | ||||
| -rw-r--r-- | app/clipboard/clipboard_unittest.cc | 1 | ||||
| -rw-r--r-- | app/slide_animation_unittest.cc | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/app/animation_container_unittest.cc b/app/animation_container_unittest.cc index e4253c6..d99531b 100644 --- a/app/animation_container_unittest.cc +++ b/app/animation_container_unittest.cc @@ -5,6 +5,7 @@ #include "app/animation_container.h" #include "app/linear_animation.h" #include "app/test_animation_delegate.h" +#include "base/scoped_ptr.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" @@ -25,7 +26,7 @@ class MockObserver : public AnimationContainer::Observer { class TestAnimation : public LinearAnimation { public: - TestAnimation(AnimationDelegate* delegate) + explicit TestAnimation(AnimationDelegate* delegate) : LinearAnimation(20, 20, delegate) { } diff --git a/app/clipboard/clipboard_unittest.cc b/app/clipboard/clipboard_unittest.cc index 7039e6b..ef82104 100644 --- a/app/clipboard/clipboard_unittest.cc +++ b/app/clipboard/clipboard_unittest.cc @@ -9,6 +9,7 @@ #include "app/clipboard/clipboard.h" #include "app/clipboard/scoped_clipboard_writer.h" #include "base/basictypes.h" +#include "base/scoped_ptr.h" #include "base/string_util.h" #include "base/utf_string_conversions.h" #include "gfx/size.h" diff --git a/app/slide_animation_unittest.cc b/app/slide_animation_unittest.cc index 8bc947f..d34b975 100644 --- a/app/slide_animation_unittest.cc +++ b/app/slide_animation_unittest.cc @@ -4,6 +4,7 @@ #include "app/slide_animation.h" #include "app/test_animation_delegate.h" +#include "base/scoped_ptr.h" #include "testing/gtest/include/gtest/gtest.h" class SlideAnimationTest: public testing::Test { |