New post-sideload UI:

chrome/browser/ui/global_error/global_error_service_unittest.cc

 // Copyright (c) 2012 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/global_error/global_error_service.h"
 
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 67 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(BaseError);
 };
 
 int BaseError::count_ = 0;
 
 // A simple error that only has a badge.
 class BadgeError : public BaseError {
  public:
   explicit BadgeError(int resource_id) : resource_id_(resource_id) {}
   bool HasBadge() OVERRIDE { return true; }
+  Severity GetSeverity() OVERRIDE {
+    return static_cast<Severity>(resource_id_);
+  }
   virtual int GetBadgeResourceID() OVERRIDE { return resource_id_; }
 
  private:
   int resource_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BadgeError);
 };
 
 // A simple error that only has a menu item.
 class MenuError : public BaseError {
@@ skipping 68 matching lines @@
   service.AddGlobalError(error3);
 
   EXPECT_EQ(error2, service.GetGlobalErrorByMenuItemCommandID(2));
   EXPECT_EQ(error3, service.GetGlobalErrorByMenuItemCommandID(3));
   EXPECT_EQ(NULL, service.GetGlobalErrorByMenuItemCommandID(4));
 }
 
 // Test getting the badge icon resource ID of the first error.
 TEST(GlobalErrorServiceTest, GetBadgeID) {
   BaseError* error1 = new BaseError;
-  BadgeError error2(2);
+  BadgeError* error2 = new BadgeError(2);
   BadgeError* error3 = new BadgeError(3);
+  BadgeError* error4 = new BadgeError(4);
 
   GlobalErrorService service(NULL);
   EXPECT_EQ(0, service.GetFirstBadgeResourceID());
 
   service.AddGlobalError(error1);
   EXPECT_EQ(0, service.GetFirstBadgeResourceID());
 
-  service.AddGlobalError(&error2);
+  service.AddGlobalError(error2);
   EXPECT_EQ(2, service.GetFirstBadgeResourceID());
 
+  service.AddGlobalError(error4);
+  EXPECT_EQ(4, service.GetFirstBadgeResourceID());
+
   service.AddGlobalError(error3);
-  EXPECT_EQ(2, service.GetFirstBadgeResourceID());
+  EXPECT_EQ(4, service.GetFirstBadgeResourceID());
 
-  // Remove the first error with a badge.
-  service.RemoveGlobalError(&error2);
+  // Remove the highest-severity error with a badge.
+  service.RemoveGlobalError(error4);
+  delete error4;
+
   // Now error3 should be the first error with a badge.
   EXPECT_EQ(3, service.GetFirstBadgeResourceID());
 }