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

chrome/browser/chromeos/profile_startup.cc

Index: chrome/browser/chromeos/profile_startup.cc
===================================================================
--- chrome/browser/chromeos/profile_startup.cc	(revision 143914)
+++ chrome/browser/chromeos/profile_startup.cc	(working copy)
@@ -50,13 +50,10 @@
     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();
   }