[Media Router] 2nd take on fix route response callback lifetime in UI.

chrome/test/media_router/media_router_e2e_browsertest.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/test/media_router/media_router_e2e_browsertest.h"
 
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "chrome/browser/media/router/media_router.h"
 #include "chrome/browser/media/router/media_router_mojo_impl.h"
@@ skipping 43 matching lines @@
       MediaRouterMojoImplFactory::GetApiForBrowserContext(browser()->profile());
   DCHECK(media_router_);
 }
 
 void MediaRouterE2EBrowserTest::TearDownOnMainThread() {
   MediaRouterBaseBrowserTest::TearDownOnMainThread();
   media_router_ = nullptr;
 }
 
 void MediaRouterE2EBrowserTest::OnRouteResponseReceived(
-    scoped_ptr<MediaRoute> route,
+    const MediaRoute* route,
     const std::string& error) {
-  ASSERT_TRUE(route.get());
+  ASSERT_TRUE(route);
   route_id_ = route->media_route_id();
 }
 
 void MediaRouterE2EBrowserTest::CreateMediaRoute(const MediaSource& source,
                                                  const GURL& origin,
                                                  int tab_id) {
   DCHECK(media_router_);
   observer_.reset(new TestMediaSinksObserver(media_router_, source));
 
   DVLOG(1) << "Receiver name: " << receiver_;
   // Wait for MediaSinks compatible with |source| to be discovered.
   ConditionalWait(base::TimeDelta::FromSeconds(30),
                   base::TimeDelta::FromSeconds(1),
                   base::Bind(&MediaRouterE2EBrowserTest::IsSinkDiscovered,
                              base::Unretained(this)));
 
   const auto& sink_map = observer_->sink_map;
   const auto it = sink_map.find(receiver_);
   const MediaSink& sink = it->second;
 
   // The callback will set route_id_ when invoked.
-  media_router_->CreateRoute(
-      source.id(), sink.id(), origin, tab_id,
+  std::vector<MediaRouteResponseCallback> route_response_callbacks;
+  route_response_callbacks.push_back(
       base::Bind(&MediaRouterE2EBrowserTest::OnRouteResponseReceived,
                  base::Unretained(this)));
+  media_router_->CreateRoute(source.id(), sink.id(), origin, tab_id,
+                             route_response_callbacks);
 
   // Wait for the route request to be fulfilled (and route to be started).
   ConditionalWait(base::TimeDelta::FromSeconds(30),
                   base::TimeDelta::FromSeconds(1),
                   base::Bind(&MediaRouterE2EBrowserTest::IsRouteCreated,
                              base::Unretained(this)));
 }
 
 void MediaRouterE2EBrowserTest::StopMediaRoute() {
   ASSERT_FALSE(route_id_.empty());
@@ skipping 45 matching lines @@
   CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl),
                    GURL("http://origin/"), kInvalidTabId);
   Wait(base::TimeDelta::FromSeconds(30));
 
   // Wait for 10 seconds to make sure route has been stopped.
   StopMediaRoute();
   Wait(base::TimeDelta::FromSeconds(10));
 }
 
 }  // namespace media_router