Fix double ripple on activated flood fill ripple

ui/views/animation/ink_drop_ripple_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_ripple.h"
 
 #include <memory>
 
 #include "base/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/geometry/insets.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/animation/flood_fill_ink_drop_ripple.h"
 #include "ui/views/animation/ink_drop_ripple_observer.h"
 #include "ui/views/animation/ink_drop_state.h"
 #include "ui/views/animation/square_ink_drop_ripple.h"
 #include "ui/views/animation/test/flood_fill_ink_drop_ripple_test_api.h"
 #include "ui/views/animation/test/ink_drop_ripple_test_api.h"
 #include "ui/views/animation/test/square_ink_drop_ripple_test_api.h"
 #include "ui/views/animation/test/test_ink_drop_ripple_observer.h"
 
 namespace views {
 namespace test {
+namespace {
+
+std::string InkDropStatesToString(const std::vector<InkDropState>& states) {
+  std::string result;
+  for (size_t i = 0; i < states.size(); i++) {
+    if (i)
+      result += " ";
+    result += ToString(states[i]);
+  }
+  return result;
+}
+
+}
 
 const float kVisibleOpacity = 0.175f;
 
 // Represents all the derivatives of the InkDropRipple class. To be used with
 // the InkDropRippleTest fixture to test all derviatives.
 enum InkDropRippleTestTypes {
   SQUARE_INK_DROP_RIPPLE,
   FLOOD_FILL_INK_DROP_RIPPLE
 };
 
@@ skipping 317 matching lines @@
 
   ink_drop_ripple_->AnimateToState(views::InkDropState::HIDDEN);
 
   test_api_->CompleteAnimations();
 
   EXPECT_TRUE(observer_.AnimationHasEnded());
   EXPECT_EQ(views::InkDropState::HIDDEN,
             observer_.target_state_at_last_animation_ended());
 }
 
+// Verifies that when an we ink drop transitions from ACTION_PENDING to
+// ACTIVATED state, animation observers are called in order.
+TEST_P(InkDropRippleTest, RipplePendingToActivatedObserverOrder) {
+  ink_drop_ripple_->AnimateToState(views::InkDropState::ACTION_PENDING);
+  ink_drop_ripple_->AnimateToState(views::InkDropState::ACTIVATED);
+  test_api_->CompleteAnimations();
+
+  EXPECT_EQ(
+      "ACTION_PENDING ACTIVATED",

[bruthig, 2017/01/10 17:08:03]

How come you are building concatenated strings here when elsewhere you use the
gmock ElementsAre matcher?
My preference is to use the ElementsAre matcher and if we want better log output
I think we can do this by adding a GTest printer for InkDropStates.  See
https://github.com/google/googletest/blob/master/googletest/docs/AdvancedGuid...

[mohsen, 2017/01/10 22:28:16]

Yeah, I also prefer gmock matchers, but gmock is forbidden in views at the
moment.

[bruthig, 2017/01/11 00:41:07]

Hmm that's unfortunate.  Is that documented somewhere or were you just told by
an OWNER?  I wonder if bringing this CL to the deciders attention would lend
weight to the argument at all...

[mohsen, 2017/01/11 15:59:44]

It is explicitly banned in ui/views/DEPS file (see https://crrev.com/107363004).
I also talked with sadrul@ and he confirmed that's still the case.

[bruthig, 2017/01/11 18:22:30]

Thx

+      InkDropStatesToString(observer_.GetAndResetAnimationStartedStates()));
+  EXPECT_EQ("ACTION_PENDING ACTIVATED",
+            InkDropStatesToString(observer_.GetAndResetAnimationEndedStates()));
+}
+
 }  // namespace test
 }  // namespace views