Re-factor TraySms to use ash::SmsObserver instead of NetoworkSmsHandler.

chromeos/network/network_sms_handler.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 "chromeos/network/network_sms_handler.h"
 
 #include <algorithm>
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 316 matching lines @@
 // NetworkSmsHandler
 
 NetworkSmsHandler::NetworkSmsHandler()
     : weak_ptr_factory_(this) {
 }
 
 NetworkSmsHandler::~NetworkSmsHandler() {
 }
 
 void NetworkSmsHandler::Init() {
+  // TODO(stevenjb): This code needs to monitor changes to Manager.Network
+  // so that devices added after Init() is called get added to device_handlers_.
+  // See: crbug.com/133416.
+
   // Request network manager properties so that we can get the list of devices.
   DBusThreadManager::Get()->GetFlimflamManagerClient()->GetProperties(
       base::Bind(&NetworkSmsHandler::ManagerPropertiesCallback,
                  weak_ptr_factory_.GetWeakPtr()));
 }
 
 void NetworkSmsHandler::RequestUpdate() {
   for (ScopedVector<NetworkSmsDeviceHandler>::iterator iter =
            device_handlers_.begin(); iter != device_handlers_.end(); ++iter) {
     (*iter)->RequestUpdate();
@@ skipping 27 matching lines @@
                << flimflam::kDevicesProperty;
     return;
   }
   const base::ListValue* devices = static_cast<const base::ListValue*>(value);
   for (base::ListValue::const_iterator iter = devices->begin();
        iter != devices->end(); ++iter) {
     std::string device_path;
     (*iter)->GetAsString(&device_path);
     if (!device_path.empty()) {
       // Request device properties.
+      VLOG(1) << "GetDeviceProperties: " << device_path;
       DBusThreadManager::Get()->GetFlimflamDeviceClient()->GetProperties(
           dbus::ObjectPath(device_path),
           base::Bind(&NetworkSmsHandler::DevicePropertiesCallback,
                      weak_ptr_factory_.GetWeakPtr(),
                      device_path));
     }
   }
 }
 
 void NetworkSmsHandler::DevicePropertiesCallback(
     const std::string& device_path,
     DBusMethodCallStatus call_status,
     const base::DictionaryValue& properties) {
-  if (call_status != DBUS_METHOD_CALL_SUCCESS)
+  if (call_status != DBUS_METHOD_CALL_SUCCESS) {
+    LOG(ERROR) << "NetworkSmsHandler: ERROR: " << call_status;
     return;
+  }
 
   std::string device_type;
   if (!properties.GetStringWithoutPathExpansion(
           flimflam::kTypeProperty, &device_type)) {
     LOG(ERROR) << "NetworkSmsHandler: No type for: " << device_path;
     return;
   }
   if (device_type != flimflam::kTypeCellular)
     return;
 
@@ skipping 19 matching lines @@
             this, dbus_connection, object_path));
   } else {
     device_handlers_.push_back(
         new ModemManagerNetworkSmsDeviceHandler(
             this, dbus_connection, object_path));
   }
 }
 
 
 }  // namespace chromeos