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

chrome/browser/notifications/desktop_notifications_unittest.h

Index: chrome/browser/notifications/desktop_notifications_unittest.h
diff --git a/chrome/browser/notifications/desktop_notifications_unittest.h b/chrome/browser/notifications/desktop_notifications_unittest.h
index 25e5270deac3f721c329cfb65aed531b37332b1d..faa470a8337ded1efea9c5947d3c850a737e4a67 100644
--- a/chrome/browser/notifications/desktop_notifications_unittest.h
+++ b/chrome/browser/notifications/desktop_notifications_unittest.h
@@ -39,14 +39,12 @@ class MockBalloonCollection : public BalloonCollectionImpl {
   // 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_; }