Fix double ripple on activated flood fill ripple

ui/views/animation/ink_drop_highlight_unittest.cc

 // Copyright 2015 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 "ui/views/animation/ink_drop_highlight.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 38 matching lines @@
   TestInkDropHighlightObserver observer_;
 
   DISALLOW_COPY_AND_ASSIGN(InkDropHighlightTest);
 };
 
 InkDropHighlightTest::InkDropHighlightTest() {
   InitHighlight(base::MakeUnique<InkDropHighlight>(
       gfx::Size(10, 10), 3, gfx::PointF(), SK_ColorBLACK));
 }
 
-InkDropHighlightTest::~InkDropHighlightTest() {}
+InkDropHighlightTest::~InkDropHighlightTest() {
+  // Destory highlight to make sure it is destroyed before the observer.
+  DestroyHighlight();
+}
 
 void InkDropHighlightTest::InitHighlight(
     std::unique_ptr<InkDropHighlight> new_highlight) {
   ink_drop_highlight_ = std::move(new_highlight);
   test_api_ =
       base::MakeUnique<InkDropHighlightTestApi>(ink_drop_highlight_.get());
   test_api()->SetDisableAnimationTimers(true);
   ink_drop_highlight()->set_observer(&observer_);
 }
 
@@ skipping 106 matching lines @@
 // Confirms a zero sized highlight doesn't crash.
 TEST_F(InkDropHighlightTest, AnimatingAZeroSizeHighlight) {
   InitHighlight(base::MakeUnique<InkDropHighlight>(
       gfx::Size(0, 0), 3, gfx::PointF(), SK_ColorBLACK));
   ink_drop_highlight()->FadeOut(base::TimeDelta::FromMilliseconds(0),
                                 false /* explode */);
 }
 
 }  // namespace test
 }  // namespace views