Use ICU plural syntax in more place

chrome/browser/local_discovery/privet_notifications.cc

 // Copyright 2013 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/local_discovery/privet_notifications.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
@@ skipping 129 matching lines @@
 
   if (!json_value ||
       !json_value->GetInteger(kPrivetInfoKeyUptime, &uptime) ||
       uptime > kTenMinutesInSeconds) {
     return;
   }
 
   DCHECK(!device->notification_may_be_active);
   device->notification_may_be_active = true;
   devices_active_++;
-  delegate_->PrivetNotify(devices_active_ > 1, true);
+  delegate_->PrivetNotify(devices_active_, true);
 }
 
 void PrivetNotificationsListener::DeviceRemoved(const std::string& name) {
   DeviceContextMap::iterator device_iter = devices_seen_.find(name);
   if (device_iter == devices_seen_.end())
     return;
   DeviceContext* device = device_iter->second.get();
 
   device->info_operation.reset();
   device->privet_http_resolution.reset();
@@ skipping 15 matching lines @@
 
   devices_active_ = 0;
   delegate_->PrivetRemoveNotification();
 }
 
 void PrivetNotificationsListener::NotifyDeviceRemoved() {
   devices_active_--;
   if (devices_active_ == 0) {
     delegate_->PrivetRemoveNotification();
   } else {
-    delegate_->PrivetNotify(devices_active_ > 1, false);
+    delegate_->PrivetNotify(devices_active_, false);
   }
 }
 
 PrivetNotificationsListener::DeviceContext::DeviceContext() {
 }
 
 PrivetNotificationsListener::DeviceContext::~DeviceContext() {
 }
 
 PrivetNotificationService::PrivetNotificationService(
@@ skipping 30 matching lines @@
   return !command_line->HasSwitch(
       switches::kDisableDeviceDiscoveryNotifications);
 }
 
 // static
 bool PrivetNotificationService::IsForced() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kEnableDeviceDiscoveryNotifications);
 }
 
-void PrivetNotificationService::PrivetNotify(bool has_multiple,
+void PrivetNotificationService::PrivetNotify(int devices_active,
                                              bool added) {
   base::string16 product_name = l10n_util::GetStringUTF16(
-      IDS_LOCAL_DISOCVERY_SERVICE_NAME_PRINTER);
+      IDS_LOCAL_DISCOVERY_SERVICE_NAME_PRINTER);
 
-  int title_resource = has_multiple ?
-      IDS_LOCAL_DISOCVERY_NOTIFICATION_TITLE_PRINTER_MULTIPLE :
-      IDS_LOCAL_DISOCVERY_NOTIFICATION_TITLE_PRINTER;
-
-  int body_resource = has_multiple ?
-      IDS_LOCAL_DISOCVERY_NOTIFICATION_CONTENTS_PRINTER_MULTIPLE :
-      IDS_LOCAL_DISOCVERY_NOTIFICATION_CONTENTS_PRINTER;
-
-  base::string16 title = l10n_util::GetStringUTF16(title_resource);
-  base::string16 body = l10n_util::GetStringUTF16(body_resource);
+  base::string16 title = l10n_util::GetPluralStringFUTF16(
+      IDS_LOCAL_DISCOVERY_NOTIFICATION_TITLE_PRINTER, devices_active);
+  base::string16 body = l10n_util::GetPluralStringFUTF16(
+      IDS_LOCAL_DISCOVERY_NOTIFICATION_CONTENTS_PRINTER, devices_active);
 
   Profile* profile_object = Profile::FromBrowserContext(profile_);
   message_center::RichNotificationData rich_notification_data;
 
   rich_notification_data.buttons.push_back(
       message_center::ButtonInfo(l10n_util::GetStringUTF16(
-          IDS_LOCAL_DISOCVERY_NOTIFICATION_BUTTON_PRINTER)));
+          IDS_LOCAL_DISCOVERY_NOTIFICATION_BUTTON_PRINTER)));
 
   rich_notification_data.buttons.push_back(
       message_center::ButtonInfo(l10n_util::GetStringUTF16(
           IDS_LOCAL_DISCOVERY_NOTIFICATIONS_DISABLE_BUTTON_LABEL)));
 
   Notification notification(
       message_center::NOTIFICATION_TYPE_SIMPLE,
       GURL(kPrivetNotificationOriginUrl),
       title,
       body,
@@ skipping 121 matching lines @@
 
 void PrivetNotificationDelegate::DisableNotifications() {
   Profile* profile_obj = Profile::FromBrowserContext(profile_);
 
   profile_obj->GetPrefs()->SetBoolean(
       prefs::kLocalDiscoveryNotificationsEnabled,
       false);
 }
 
 }  // namespace local_discovery