| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include <map> | 5 #include <map> |
| 6 | 6 |
| 7 #include "base/gtest_prod_util.h" | 7 #include "base/gtest_prod_util.h" |
| 8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
| (...skipping 23 matching lines...) Expand all Loading... |
| 34 using syncer::SyncData; | 34 using syncer::SyncData; |
| 35 using syncer::SyncChange; | 35 using syncer::SyncChange; |
| 36 using syncer::SyncChangeList; | 36 using syncer::SyncChangeList; |
| 37 using syncer::SyncDataList; | 37 using syncer::SyncDataList; |
| 38 using syncer::SYNCED_NOTIFICATIONS; | 38 using syncer::SYNCED_NOTIFICATIONS; |
| 39 using notifier::SyncedNotification; | 39 using notifier::SyncedNotification; |
| 40 using notifier::ChromeNotifierService; | 40 using notifier::ChromeNotifierService; |
| 41 | 41 |
| 42 namespace { | 42 namespace { |
| 43 | 43 |
| 44 const int kNotificationPriority = static_cast<int>( | |
| 45 message_center::LOW_PRIORITY); | |
| 46 | |
| 47 // Extract notification id from syncer::SyncData. | 44 // Extract notification id from syncer::SyncData. |
| 48 std::string GetNotificationId(const SyncData& sync_data) { | 45 std::string GetNotificationId(const SyncData& sync_data) { |
| 49 SyncedNotificationSpecifics specifics = sync_data.GetSpecifics(). | 46 SyncedNotificationSpecifics specifics = sync_data.GetSpecifics(). |
| 50 synced_notification(); | 47 synced_notification(); |
| 51 | 48 |
| 52 return specifics.coalesced_notification().key(); | 49 return specifics.coalesced_notification().key(); |
| 53 } | 50 } |
| 54 | 51 |
| 55 } // namespace | 52 } // namespace |
| 56 | 53 |
| (...skipping 635 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 692 // Verify that the first synced notification service is enabled in memory. | 689 // Verify that the first synced notification service is enabled in memory. |
| 693 std::set<std::string>::iterator iter; | 690 std::set<std::string>::iterator iter; |
| 694 iter = find(notifier.enabled_sending_services_.begin(), | 691 iter = find(notifier.enabled_sending_services_.begin(), |
| 695 notifier.enabled_sending_services_.end(), | 692 notifier.enabled_sending_services_.end(), |
| 696 first_synced_notification_service_id); | 693 first_synced_notification_service_id); |
| 697 | 694 |
| 698 EXPECT_NE(notifier.enabled_sending_services_.end(), iter); | 695 EXPECT_NE(notifier.enabled_sending_services_.end(), iter); |
| 699 } | 696 } |
| 700 | 697 |
| 701 } // namespace notifier | 698 } // namespace notifier |
| OLD | NEW |