Fix PrivetNotificationService::PrivetNotify() silliness.

chrome/browser/printing/cloud_print/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/printing/cloud_print/privet_notifications.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 73 matching lines @@
   privet_http_factory_.swap(privet_http_factory);
 }
 
 PrivetNotificationsListener::~PrivetNotificationsListener() {
 }
 
 void PrivetNotificationsListener::DeviceChanged(
     const std::string& name,
     const DeviceDescription& description) {
   ReportPrivetUmaEvent(PRIVET_DEVICE_CHANGED);
-  DeviceContextMap::iterator found = devices_seen_.find(name);
-  if (found != devices_seen_.end()) {
+  DeviceContextMap::iterator it = devices_seen_.find(name);
+  if (it != devices_seen_.end()) {
     if (!description.id.empty() &&  // Device is registered
-        found->second->notification_may_be_active) {
-      found->second->notification_may_be_active = false;
+        it->second->notification_may_be_active) {
+      it->second->notification_may_be_active = false;
       NotifyDeviceRemoved();
     }
     return;  // Already saw this device.
   }
 
   std::unique_ptr<DeviceContext>& device_context = devices_seen_[name];
   device_context.reset(new DeviceContext);
   device_context->notification_may_be_active = false;
   device_context->registered = !description.id.empty();
 
   if (!device_context->registered) {
     device_context->privet_http_resolution =
         privet_http_factory_->CreatePrivetHTTP(name);
     device_context->privet_http_resolution->Start(
         description.address,
         base::Bind(&PrivetNotificationsListener::CreateInfoOperation,
                    base::Unretained(this)));
   }
 }
 
 void PrivetNotificationsListener::CreateInfoOperation(
     std::unique_ptr<PrivetHTTPClient> http_client) {
-  if (!http_client) {
-    // Do nothing if resolution fails.
+  // Do nothing if resolution fails.
+  if (!http_client)
     return;
-  }
 
   std::string name = http_client->GetName();
-  DeviceContextMap::iterator device_iter = devices_seen_.find(name);
-  if (device_iter == devices_seen_.end())
+  DeviceContextMap::iterator it = devices_seen_.find(name);
+  if (it == devices_seen_.end())
     return;
-  DeviceContext* device = device_iter->second.get();
+
+  DeviceContext* device = it->second.get();
   device->privet_http.swap(http_client);
   device->info_operation = device->privet_http->CreateInfoOperation(
       base::Bind(&PrivetNotificationsListener::OnPrivetInfoDone,
                  base::Unretained(this),
                  device));
   device->info_operation->Start();
 }
 
 void PrivetNotificationsListener::OnPrivetInfoDone(
     DeviceContext* device,
     const base::DictionaryValue* json_value) {
   int uptime;
 
   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_, true);
 }
 
 void PrivetNotificationsListener::DeviceRemoved(const std::string& name) {
-  DeviceContextMap::iterator device_iter = devices_seen_.find(name);
-  if (device_iter == devices_seen_.end())
+  DeviceContextMap::iterator it = devices_seen_.find(name);
+  if (it == devices_seen_.end())
     return;
-  DeviceContext* device = device_iter->second.get();
 
+  DeviceContext* device = it->second.get();
   device->info_operation.reset();
   device->privet_http_resolution.reset();
   device->notification_may_be_active = false;
   NotifyDeviceRemoved();
 }
 
 void PrivetNotificationsListener::DeviceCacheFlushed() {
-  for (DeviceContextMap::iterator i = devices_seen_.begin();
-       i != devices_seen_.end(); ++i) {
-    DeviceContext* device = i->second.get();
+  for (const auto& it : devices_seen_) {
+    DeviceContext* device = it.second.get();
 
     device->info_operation.reset();
     device->privet_http_resolution.reset();
     if (device->notification_may_be_active) {

[Lei Zhang, 2016/06/01 02:15:17]

This is an unneeded check, removed in the next patch set.

       device->notification_may_be_active = false;
     }
   }
 
   devices_active_ = 0;
   delegate_->PrivetRemoveNotification();
 }
 
 void PrivetNotificationsListener::NotifyDeviceRemoved() {
   devices_active_--;
@@ skipping 198 matching lines @@
 
 void PrivetNotificationDelegate::DisableNotifications() {
   Profile* profile_obj = Profile::FromBrowserContext(profile_);
 
   profile_obj->GetPrefs()->SetBoolean(
       prefs::kLocalDiscoveryNotificationsEnabled,
       false);
 }
 
 }  // namespace cloud_print