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

chrome/browser/notifications/desktop_notifications_unittest.cc

 // 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.
 
 #include "chrome/browser/notifications/desktop_notifications_unittest.h"
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
@@ skipping 17 matching lines @@
   // balloon collection.
   Notification test_notification(
       notification.origin_url(),
       notification.content_url(),
       notification.display_source(),
       notification.replace_id(),
       new LoggingNotificationProxy(notification.notification_id()));
   BalloonCollectionImpl::Add(test_notification, profile);
 }
 
+bool MockBalloonCollection::HasSpace() const {
+  return count() < kMockBalloonSpace;
+}
+
 Balloon* MockBalloonCollection::MakeBalloon(const Notification& notification,
                                             Profile* profile) {
   // Start with a normal balloon but mock out the view.
   Balloon* balloon = BalloonCollectionImpl::MakeBalloon(notification, profile);
   balloon->set_view(new MockBalloonView(balloon));
   balloons_.push_back(balloon);
   return balloon;
 }
 
 void MockBalloonCollection::OnBalloonClosed(Balloon* source) {
   std::deque<Balloon*>::iterator it;
   for (it = balloons_.begin(); it != balloons_.end(); ++it) {
     if (*it == source) {
       balloons_.erase(it);
       BalloonCollectionImpl::OnBalloonClosed(source);
       break;
     }
   }
 }
 
+const BalloonCollection::Balloons& MockBalloonCollection::GetActiveBalloons() {
+  return balloons_;
+}
+
 int MockBalloonCollection::UppermostVerticalPosition() {
   int min = 0;
   std::deque<Balloon*>::iterator iter;
   for (iter = balloons_.begin(); iter != balloons_.end(); ++iter) {
     int pos = (*iter)->GetPosition().y();
     if (iter == balloons_.begin() || pos < min)
       min = pos;
   }
   return min;
 }
@@ skipping 360 matching lines @@
   }
 
   // Now change the position to upper left.  Confirm that the X value for the
   // balloons gets smaller.
   profile_->GetPrefs()->SetInteger(prefs::kDesktopNotificationPosition,
                                    BalloonCollection::UPPER_LEFT);
 
   int current_x = (*balloons.begin())->GetPosition().x();
   EXPECT_LT(current_x, last_x);
 }