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

chrome/browser/chromeos/profile_startup.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 "chrome/browser/chromeos/profile_startup.h"
 
 #include "ash/ash_switches.h"
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
@@ skipping 32 matching lines @@
 
     static chromeos::NetworkMessageObserver* network_message_observer =
         new chromeos::NetworkMessageObserver(profile);
     chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
         AddNetworkManagerObserver(network_message_observer);
     chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
         AddCellularDataPlanObserver(network_message_observer);
     chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
         AddUserActionObserver(network_message_observer);
 
-    if (CommandLine::ForCurrentProcess()->HasSwitch(
-            ash::switches::kAshNotifyDisabled)) {
-      static chromeos::SmsObserver* sms_observer =
-          new chromeos::SmsObserver(profile);
-      chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
-          AddNetworkManagerObserver(sms_observer);
-    }
+    static chromeos::SmsObserver* sms_observer =
+        new chromeos::SmsObserver(profile);
+    chromeos::CrosLibrary::Get()->GetNetworkLibrary()->
+        AddNetworkManagerObserver(sms_observer);
 
     profile->SetupChromeOSEnterpriseExtensionObserver();
   }
 }
 
 }  // namespace chromeos