[MediaRouter] Renames CloseRoute() to Terminate() and creates DetachRoute()

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 <vector>
 #include "base/command_line.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
@@ skipping 96 matching lines @@
 
   // Wait for the route request to be fulfilled (and route to be started).
   ASSERT_TRUE(ConditionalWait(
       base::TimeDelta::FromSeconds(30), base::TimeDelta::FromSeconds(1),
       base::Bind(&MediaRouterE2EBrowserTest::IsRouteCreated,
                  base::Unretained(this))));
 }
 
 void MediaRouterE2EBrowserTest::StopMediaRoute() {
   ASSERT_FALSE(route_id_.empty());
-
-  media_router_->CloseRoute(route_id_);
+  media_router_->TerminateRoute(route_id_);
 }
 
 bool MediaRouterE2EBrowserTest::IsSinkDiscovered() const {
   return ContainsKey(observer_->sink_map, receiver());
 }
 
 bool MediaRouterE2EBrowserTest::IsRouteCreated() const {
   return !route_id_.empty();
 }
 
@@ skipping 34 matching lines @@
   CreateMediaRoute(MediaSourceForPresentationUrl(kCastAppPresentationUrl),
                    GURL(kOriginUrl), nullptr);
   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