Removed --disable-device-discovery switch.

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 207 matching lines @@
   privet_notifications_listener_->DeviceRemoved(name);
 }
 
 void PrivetNotificationService::DeviceCacheFlushed() {
   privet_notifications_listener_->DeviceCacheFlushed();
 }
 
 // static
 bool PrivetNotificationService::IsEnabled() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
-  return !command_line->HasSwitch(switches::kDisableDeviceDiscovery) &&
-      !command_line->HasSwitch(switches::kDisableDeviceDiscoveryNotifications);
+  return !command_line->HasSwitch(
+      switches::kDisableDeviceDiscoveryNotifications);
 }
 
 // static
 bool PrivetNotificationService::IsForced() {
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   return command_line->HasSwitch(switches::kEnableDeviceDiscoveryNotifications);
 }
 
 void PrivetNotificationService::PrivetNotify(bool has_multiple,
                                              bool added) {
@@ skipping 167 matching lines @@
 
 void PrivetNotificationDelegate::DisableNotifications() {
   Profile* profile_obj = Profile::FromBrowserContext(profile_);
 
   profile_obj->GetPrefs()->SetBoolean(
       prefs::kLocalDiscoveryNotificationsEnabled,
       false);
 }
 
 }  // namespace local_discovery