Cleanup: Remove more dead GTK code.

chrome/browser/notifications/sync_notifier/chrome_notifier_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 <map>
 
 #include "base/command_line.h"
 #include "base/gtest_prod_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
@@ skipping 211 matching lines @@
       ChromeNotifierService::CreateSyncDataFromNotification(*notification1);
   scoped_ptr<SyncedNotification> notification2(
       notifier.CreateNotificationFromSyncData(sync_data));
   EXPECT_TRUE(notification2.get());
   EXPECT_TRUE(notification1->EqualsIgnoringReadState(*notification2));
   EXPECT_EQ(notification1->GetReadState(), notification2->GetReadState());
 }
 
 // Model assocation:  We have no local data, and no remote data.
 TEST_F(ChromeNotifierServiceTest, ModelAssocBothEmpty) {
-
   ChromeNotifierService notifier(profile_.get(), notification_manager());
 
   notifier.MergeDataAndStartSyncing(
       SYNCED_NOTIFICATIONS,
       SyncDataList(),  // Empty.
       PassProcessor(),
       scoped_ptr<syncer::SyncErrorFactory>(new syncer::SyncErrorFactoryMock()));
 
   EXPECT_EQ(0U, notifier.GetAllSyncData(SYNCED_NOTIFICATIONS).size());
   EXPECT_EQ(0U, processor()->change_list_size());
@@ skipping 338 matching lines @@
   // notification_manager.
   notifier.OnSyncedNotificationServiceEnabled(kSendingService1Name, false);
   iter = find(notifier.enabled_sending_services_.begin(),
               notifier.enabled_sending_services_.end(),
               first_synced_notification_service_id);
 
   EXPECT_EQ(notifier.enabled_sending_services_.end(), iter);
   EXPECT_EQ(notification_manager()->dismissed_id(), std::string(kKey1));
 }
 
-// http://crbug.com/341326
-#if defined(TOOLKIT_GTK)
-#define MAYBE_AddNewSendingServicesTest DISABLED_AddNewSendingServicesTest
-#else
-#define MAYBE_AddNewSendingServicesTest AddNewSendingServicesTest
-#endif
-TEST_F(ChromeNotifierServiceTest, MAYBE_AddNewSendingServicesTest) {
+TEST_F(ChromeNotifierServiceTest, AddNewSendingServicesTest) {
   // This test will see if we get a new sending service after the first
   // notification for that service.
   ChromeNotifierService notifier(profile_.get(), notification_manager());
   notifier.set_avoid_bitmap_fetching_for_test(true);
 
   // We initially have no data.
   EXPECT_EQ(0U, notifier.enabled_sending_services_.size());
   EXPECT_EQ(0U, notifier.GetAllSyncData(SYNCED_NOTIFICATIONS).size());
 
   // Set up an ADD.
@@ skipping 72 matching lines @@
 
   notifier.ProcessSyncChanges(FROM_HERE, changes);
 
   // Since we added to |initialized_sending_services_| before receiving the
   // synced notification, we should not have enabled this service while
   // processing the sync change.
   EXPECT_EQ(0U, notifier.enabled_sending_services_.size());
   EXPECT_EQ(0U, notification_manager()->added_notifications());
 }
 
-#if defined(TOOLKIT_GTK)
-// TODO(petewil): crbug.com/358031
-#define MAYBE_SetAddedAppIdsTest DISABLED_SetAddedAppIdsTest
-#else
-#define MAYBE_SetAddedAppIdsTest SetAddedAppIdsTest
-#endif
-TEST_F(ChromeNotifierServiceTest, MAYBE_SetAddedAppIdsTest) {
+TEST_F(ChromeNotifierServiceTest, SetAddedAppIdsTest) {
   ChromeNotifierService notifier(profile_.get(), notification_manager());
   notifier.set_avoid_bitmap_fetching_for_test(true);
 
   // Add some notifications to our notification list.
   scoped_ptr<SyncedNotification> n1(CreateNotification(
       kTitle1, kText1, kIconUrl1, kImageUrl1, kAppId1, kKey1, kUnread));
   n1->SetNotifierServiceForTest(&notifier);
   notifier.AddForTest(n1.Pass());
 
   EXPECT_EQ(static_cast<size_t>(0),
@@ skipping 25 matching lines @@
   notifier.OnRemovedAppIds(removed_app_ids);
 
   // Verify the notification was "removed" in the notification manager.
   EXPECT_EQ(std::string(kKey1), notification_manager()->dismissed_id());
 }
 
 // TODO(petewil): Add a test that we do *not* get a welcome dialog unless we
 // have a valid app info for the notification.
 
 }  // namespace notifier