Revert 156318 - I had originally tried to build upon http://codereview.chromium.org/10869066/, but …

ui/views/view_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <map>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/rand_util.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
@@ skipping 2855 matching lines @@
 // Test implementation of LayerAnimator.
 class TestLayerAnimator : public ui::LayerAnimator {
  public:
   TestLayerAnimator();
 
   const gfx::Rect& last_bounds() const { return last_bounds_; }
 
   // LayerAnimator.
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
 
- protected:
-  ~TestLayerAnimator() { }
-
  private:
   gfx::Rect last_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(TestLayerAnimator);
 };
 
 TestLayerAnimator::TestLayerAnimator()
     : ui::LayerAnimator(base::TimeDelta::FromMilliseconds(0)) {
 }
 
@@ skipping 494 matching lines @@
   // Set to non default value.
   v->layer()->set_scale_content(false);
   scoped_ptr<ui::Layer> old_layer(v->RecreateLayer());
   ui::Layer* new_layer = v->layer();
   EXPECT_FALSE(new_layer->scale_content());
 }
 
 #endif  // USE_AURA
 
 }  // namespace views