Check --utility-enable-mdns before local_discovery::ServiceDiscoveryMessageHandler::PreSandboxStart…

chrome/utility/chrome_content_utility_client.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/utility/chrome_content_utility_client.h"
 
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 161 matching lines @@
        !handled && it != handlers_.end(); ++it) {
     handled = (*it)->OnMessageReceived(message);
   }
 
   return handled;
 }
 
 // static
 void ChromeContentUtilityClient::PreSandboxStartup() {
 #if defined(ENABLE_MDNS)
-  local_discovery::ServiceDiscoveryMessageHandler::PreSandboxStartup();
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kUtilityProcessEnableMDns)) {
+    local_discovery::ServiceDiscoveryMessageHandler::PreSandboxStartup();
+  }
 #endif  // ENABLE_MDNS
 
   // Load media libraries for media file validation.
   base::FilePath media_path;
   PathService::Get(content::DIR_MEDIA_LIBS, &media_path);
   if (!media_path.empty())
     media::InitializeMediaLibrary(media_path);
 }
 
 void ChromeContentUtilityClient::OnUnpackExtension(
@@ skipping 430 matching lines @@
   picasa::PicasaAlbumsIndexer indexer(album_uids);
   indexer.ParseFolderINI(folders_inis);
 
   Send(new ChromeUtilityHostMsg_IndexPicasaAlbumsContents_Finished(
       indexer.albums_images()));
   ReleaseProcessIfNeeded();
 }
 #endif  // defined(OS_WIN) || defined(OS_MACOSX)
 
 }  // namespace chrome