Even more test cleanup. Some fixes to non-test code.

chrome/browser/notifications/desktop_notifications_unittest.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
 #define CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_
 #pragma once
 
 #include <deque>
 #include <string>
@@ skipping 21 matching lines @@
   virtual ~MockBalloonCollection();
 
   // Our mock collection has an area large enough for a fixed number
   // of balloons.
   static const int kMockBalloonSpace;
   int max_balloon_count() const { return kMockBalloonSpace; }
 
   // BalloonCollectionImpl overrides
   virtual void Add(const Notification& notification,
                    Profile* profile);
-  virtual bool HasSpace() const { return count() < kMockBalloonSpace; }
+  virtual bool HasSpace() const;
   virtual Balloon* MakeBalloon(const Notification& notification,
                                Profile* profile);
   virtual void DisplayChanged() {}
   virtual void OnBalloonClosed(Balloon* source);
-  virtual const BalloonCollection::Balloons& GetActiveBalloons() {
-    return balloons_;
-  }
+  virtual const BalloonCollection::Balloons& GetActiveBalloons();
 
   // Number of balloons being shown.
   std::deque<Balloon*>& balloons() { return balloons_; }
   int count() const { return balloons_.size(); }
 
   // Returns the highest y-coordinate of all the balloons in the collection.
   int UppermostVerticalPosition();
 
   // Returns the height bounds of a balloon.
   int MinHeight() { return Layout::min_balloon_height(); }
@@ skipping 54 matching lines @@
   scoped_ptr<NotificationUIManager> ui_manager_;
 
   // Real DesktopNotificationService
   scoped_ptr<DesktopNotificationService> service_;
 
   // Contains the cumulative output of the unit test.
   static std::string log_output_;
 };
 
 #endif  // CHROME_BROWSER_NOTIFICATIONS_DESKTOP_NOTIFICATIONS_UNITTEST_H_