Fix flaky tests by disabling DeviceDiscoveryNotification service.

chrome/browser/extensions/api/gcd_private/gcd_private_apitest.cc

 // Copyright 2014 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 <stdint.h>
 
 #include "base/command_line.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/extensions/api/gcd_private/gcd_private_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 72 matching lines @@
       : url_fetcher_factory_(
             &url_fetcher_impl_factory_,
             base::Bind(&GcdPrivateAPITest::CreateFakeURLFetcher,
                        base::Unretained(this))) {}
 
   void SetUpCommandLine(base::CommandLine* command_line) override {
     ExtensionApiTest::SetUpCommandLine(command_line);
     command_line->AppendSwitchASCII(
         extensions::switches::kWhitelistedExtensionID,
         "ddchlicdkolnonkihahngkmmmjnjlkkf");
+    command_line->AppendSwitch(switches::kDisableDeviceDiscoveryNotifications);
   }
 
   std::unique_ptr<net::FakeURLFetcher> CreateFakeURLFetcher(
       const GURL& url,
       net::URLFetcherDelegate* fetcher_delegate,
       const std::string& response_data,
       net::HttpStatusCode response_code,
       net::URLRequestStatus::Status status) {
     std::unique_ptr<net::FakeURLFetcher> fetcher(new net::FakeURLFetcher(
         url, fetcher_delegate, response_data, response_code, status));
@@ skipping 32 matching lines @@
         base::Bind(
             &local_discovery::TestServiceDiscoveryClient::SimulateReceive,
             test_service_discovery_client_, packet, size),
         base::TimeDelta::FromSeconds(1));
   }
 
   scoped_refptr<local_discovery::TestServiceDiscoveryClient>
       test_service_discovery_client_;
 };
 
-// Flaky on Linux(dbg). https://crbug.com/689305
-IN_PROC_BROWSER_TEST_F(GcdPrivateWithMdnsAPITest, DISABLED_DeviceInfo) {
+IN_PROC_BROWSER_TEST_F(GcdPrivateWithMdnsAPITest, DeviceInfo) {
   test_service_discovery_client_->SimulateReceive(kAnnouncePacket,
                                                   sizeof(kAnnouncePacket));
   url_fetcher_factory_.SetFakeResponse(GURL("http://1.2.3.4:8888/privet/info"),
                                        kPrivetInfoResponse,
                                        net::HTTP_OK,
                                        net::URLRequestStatus::SUCCESS);
   EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "device_info.html"));
 }
 
 IN_PROC_BROWSER_TEST_F(GcdPrivateWithMdnsAPITest, Session) {
   test_service_discovery_client_->SimulateReceive(kAnnouncePacket,
                                                   sizeof(kAnnouncePacket));
   url_fetcher_factory_.SetFakeResponse(GURL("http://1.2.3.4:8888/privet/info"),
                                        kPrivetInfoResponse,
                                        net::HTTP_OK,
                                        net::URLRequestStatus::SUCCESS);
   EXPECT_TRUE(RunExtensionSubtest("gcd_private/api", "session.html"));
 }
 
 }  // namespace