Audio indicator: Views UI

chrome/browser/ui/views/tabs/tab_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 "chrome/browser/ui/views/tabs/tab.h"
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/list_selection_model.h"
@@ skipping 50 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(FakeTabController);
 };
 
 class TabTest : public views::ViewsTestBase {
  public:
   TabTest() {}
   virtual ~TabTest() {}
 
   static bool IconAnimationInvariant(const Tab& tab) {
-    if ((tab.data().audio_state != TabRendererData::AUDIO_STATE_NONE) ||
-        (tab.data().capture_state != TabRendererData::CAPTURE_STATE_NONE))
-      return HasIconAnimation(tab);
-    else
-      return !HasIconAnimation(tab);
-  }
-
- private:
-  static bool HasIconAnimation(const Tab& tab) {
-    return (tab.icon_animation_.get() != NULL);
+    bool capture_invariant =
+        tab.data().CaptureActive() == (tab.icon_animation_.get() != NULL);
+    bool audio_invariant =
+        !tab.data().AudioActive() || tab.tab_audio_indicator_->IsAnimating();
+    return capture_invariant && audio_invariant;
   }
 };
 
 TEST_F(TabTest, HitTestTopPixel) {
   Widget widget;
   Widget::InitParams params(CreateParams(Widget::InitParams::TYPE_WINDOW));
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.bounds.SetRect(10, 20, 300, 400);
   widget.Init(params);
 
@@ skipping 57 matching lines @@
   EXPECT_EQ(TabRendererData::AUDIO_STATE_NONE, tab.data().audio_state);
   EXPECT_EQ(TabRendererData::CAPTURE_STATE_NONE, tab.data().capture_state);
   EXPECT_TRUE(IconAnimationInvariant(tab));
 
   // Audio starts then capture starts, then audio stops then capture stops.
   data.audio_state = TabRendererData::AUDIO_STATE_PLAYING;
   tab.SetData(data);
   data.capture_state = TabRendererData::CAPTURE_STATE_RECORDING;
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
-  EXPECT_EQ(TabRendererData::AUDIO_STATE_NONE, tab.data().audio_state);
+  EXPECT_EQ(TabRendererData::AUDIO_STATE_PLAYING, tab.data().audio_state);
   EXPECT_EQ(TabRendererData::CAPTURE_STATE_RECORDING, tab.data().capture_state);
 
   data.title = ASCIIToUTF16("test X");
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
 
   data.audio_state = TabRendererData::AUDIO_STATE_NONE;
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
   EXPECT_EQ(TabRendererData::CAPTURE_STATE_RECORDING, tab.data().capture_state);
   data.capture_state = TabRendererData::CAPTURE_STATE_NONE;
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
   EXPECT_EQ(TabRendererData::AUDIO_STATE_NONE, tab.data().audio_state);
   EXPECT_EQ(TabRendererData::CAPTURE_STATE_NONE, tab.data().capture_state);
 
   // Audio starts then capture starts, then capture stops then audio stops.
   data.audio_state = TabRendererData::AUDIO_STATE_PLAYING;
   tab.SetData(data);
   data.capture_state = TabRendererData::CAPTURE_STATE_RECORDING;
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
-  EXPECT_EQ(TabRendererData::AUDIO_STATE_NONE, tab.data().audio_state);
+  EXPECT_EQ(TabRendererData::AUDIO_STATE_PLAYING, tab.data().audio_state);
   EXPECT_EQ(TabRendererData::CAPTURE_STATE_RECORDING, tab.data().capture_state);
 
   data.title = ASCIIToUTF16("test Y");
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
 
   data.capture_state = TabRendererData::CAPTURE_STATE_NONE;
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
   EXPECT_EQ(TabRendererData::CAPTURE_STATE_NONE, tab.data().capture_state);
 
   data.audio_state = TabRendererData::AUDIO_STATE_NONE;
   tab.SetData(data);
   EXPECT_TRUE(IconAnimationInvariant(tab));
   EXPECT_EQ(TabRendererData::AUDIO_STATE_NONE, tab.data().audio_state);
   EXPECT_EQ(TabRendererData::CAPTURE_STATE_NONE, tab.data().capture_state);
   EXPECT_TRUE(IconAnimationInvariant(tab));
 }