[Media Router] Add features to control browser side discovery

chrome/browser/media/router/mojo/media_router_mojo_impl.cc

 // Copyright 2015 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/media/router/mojo/media_router_mojo_impl.h"
 
 #include <stddef.h>
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "base/observer_list.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/media/router/issues_observer.h"
 #include "chrome/browser/media/router/media_router_factory.h"
+#include "chrome/browser/media/router/media_router_feature.h"
 #include "chrome/browser/media/router/media_routes_observer.h"
 #include "chrome/browser/media/router/media_sinks_observer.h"
 #include "chrome/browser/media/router/mojo/media_route_controller.h"
 #include "chrome/browser/media/router/mojo/media_route_provider_util_win.h"
 #include "chrome/browser/media/router/mojo/media_router_mojo_metrics.h"
 #include "chrome/browser/media/router/route_message_observer.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/common/media_router/media_source_helper.h"
 #include "chrome/common/media_router/route_message.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 115 matching lines @@
            "suspended.";
     media_route_provider_.reset();
     SetWakeReason(MediaRouteProviderWakeReason::REGISTER_MEDIA_ROUTE_PROVIDER);
     AttemptWakeEventPage();
     return;
   }
 
   media_route_provider_ = std::move(media_route_provider_ptr);
   media_route_provider_.set_connection_error_handler(base::Bind(
       &MediaRouterMojoImpl::OnConnectionError, base::Unretained(this)));
-  callback.Run(instance_id_);
+
+  auto config = mojom::MediaRouteProviderConfig::New();
+  config->enable_dial_discovery = !media_router::DialLocalDiscoveryEnabled();

[dcheng, 2017/05/11 20:43:23]

Are these booleans backwards?

[zhaobin, 2017/05/11 20:48:34]

On purpose. media_router::DialLocalDiscoveryEnabled() means browser (Media
Router) enables DIAL discovery; extension (Media Router Provider) disables DIAL
discovery.

+  config->enable_cast_discovery = !media_router::CastDiscoveryEnabled();
+  callback.Run(instance_id_, std::move(config));
   ExecutePendingRequests();
   SyncStateToMediaRouteProvider();
 
   wakeup_attempt_count_ = 0;
 }
 
 void MediaRouterMojoImpl::OnIssue(const IssueInfo& issue) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DVLOG_WITH_INSTANCE(1) << "OnIssue " << issue.title;
   issue_manager_.AddIssue(issue);
@@ skipping 924 matching lines @@
 
 void MediaRouterMojoImpl::OnMediaControllerCreated(
     const MediaRoute::Id& route_id,
     bool success) {
   // TODO(takumif): Record success/failure with UMA.
   DVLOG_WITH_INSTANCE(1) << "OnMediaControllerCreated: " << route_id
                          << (success ? " was successful." : " failed.");
 }
 
 }  // namespace media_router