| Index: chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc
|
| diff --git a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc
|
| index 322ca87c030d05d776c997f9062c98258774b189..66bde4edd1258685d4a882daebdb65831c51509c 100644
|
| --- a/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc
|
| +++ b/chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc
|
| @@ -2,10 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#include "chrome/browser/ui/gtk/status_icons/status_tray_gtk.h"
|
| +
|
| #include "base/string_util.h"
|
| #include "base/utf_string_conversions.h"
|
| +#include "chrome/browser/status_icons/status_icon_observer.h"
|
| #include "chrome/browser/ui/gtk/status_icons/status_icon_gtk.h"
|
| -#include "chrome/browser/ui/gtk/status_icons/status_tray_gtk.h"
|
| #include "grit/theme_resources.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| @@ -14,9 +16,9 @@
|
|
|
| namespace {
|
|
|
| -class MockStatusIconObserver : public StatusIcon::Observer {
|
| +class MockStatusIconObserver : public StatusIconObserver {
|
| public:
|
| - MOCK_METHOD0(OnClicked, void());
|
| + MOCK_METHOD0(OnStatusIconClicked, void());
|
| };
|
|
|
| TEST(StatusTrayGtkTest, CreateTray) {
|
| @@ -44,7 +46,7 @@ TEST(StatusTrayGtkTest, ClickOnIcon) {
|
| StatusIconGtk* icon = static_cast<StatusIconGtk*>(tray.CreateStatusIcon());
|
| MockStatusIconObserver observer;
|
| icon->AddObserver(&observer);
|
| - EXPECT_CALL(observer, OnClicked());
|
| + EXPECT_CALL(observer, OnStatusIconClicked());
|
| // Mimic a click.
|
| icon->OnClick(NULL);
|
| icon->RemoveObserver(&observer);
|
|
|