status_icons: Factor out status icon observer into its own header file.

chrome/browser/ui/gtk/status_icons/status_tray_gtk_unittest.cc

 // Copyright (c) 2011 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/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"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/resource/resource_bundle.h"
 
 namespace {
 
-class MockStatusIconObserver : public StatusIcon::Observer {
+class MockStatusIconObserver : public StatusIconObserver {
  public:
-  MOCK_METHOD0(OnClicked, void());
+  MOCK_METHOD0(OnStatusIconClicked, void());
 };
 
 TEST(StatusTrayGtkTest, CreateTray) {
   // Just tests creation/destruction.
   StatusTrayGtk tray;
 }
 
 TEST(StatusTrayGtkTest, CreateIcon) {
   // Create an icon, set the images and tooltip, then shut it down.
   StatusTrayGtk tray;
   StatusIcon* icon = tray.CreateStatusIcon();
   SkBitmap* bitmap = ui::ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_STATUS_TRAY_ICON);
   icon->SetImage(*bitmap);
   icon->SetPressedImage(*bitmap);
   icon->SetToolTip(ASCIIToUTF16("tool tip"));
   ui::SimpleMenuModel* menu = new ui::SimpleMenuModel(NULL);
   menu->AddItem(0, ASCIIToUTF16("foo"));
   icon->SetContextMenu(menu);
 }
 
 TEST(StatusTrayGtkTest, ClickOnIcon) {
   // Create an icon, send a fake click event, make sure observer is called.
   StatusTrayGtk tray;
   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);
 }
 
 }  // namespace