Revert 289542 "Disable leaky NotificationToNotificationOptions"

trunk/src/chrome/browser/notifications/notification_conversion_helper_unittest.cc

 // Copyright 2014 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/notification_conversion_helper.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_test_util.h"
 #include "chrome/common/extensions/api/notifications.h"
@@ skipping 59 matching lines @@
         optional_fields,
         delegate));
 
     return notification.Pass();
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NotificationConversionHelperTest);
 };
 
-// TODO(liyanhou): This test is disabled due to memory leaks. Fix and re-enable.
-// http://crbug.com/403759
-TEST_F(NotificationConversionHelperTest,
-       DISABLED_NotificationToNotificationOptions) {
+TEST_F(NotificationConversionHelperTest, NotificationToNotificationOptions) {
   // Create a notification of image type
   scoped_ptr<Notification> notification1 =
       CreateNotification(message_center::NOTIFICATION_TYPE_IMAGE);
   scoped_ptr<extensions::api::notifications::NotificationOptions> options1(
       new extensions::api::notifications::NotificationOptions());
   NotificationConversionHelper::NotificationToNotificationOptions(
       *(notification1), options1.get());
 
   EXPECT_EQ(options1->type,
             extensions::api::notifications::TEMPLATE_TYPE_IMAGE);
@@ skipping 26 matching lines @@
   scoped_ptr<extensions::api::notifications::NotificationOptions> options3(
       new extensions::api::notifications::NotificationOptions());
   NotificationConversionHelper::NotificationToNotificationOptions(
       *(notification3), options3.get());
   EXPECT_EQ(options3->type, extensions::api::notifications::TEMPLATE_TYPE_LIST);
   EXPECT_EQ(options3->items->at(0)->title, "Item 1 Title");
   EXPECT_EQ(options3->items->at(0)->message, "Item 1 Message");
   EXPECT_EQ(options3->items->at(1)->title, "Item 2 Title");
   EXPECT_EQ(options3->items->at(1)->message, "Item 2 Message");
 }