Revert of [Presentation API / Media Router] Clean up default pres URL logic.

chrome/browser/media/router/media_router_dialog_controller.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/media_router_dialog_controller.h"
 
 #include "chrome/browser/media/router/media_router_metrics.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ skipping 55 matching lines @@
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   DCHECK(initiator_);
   initiator_observer_.reset(new InitiatorWebContentsObserver(initiator_, this));
 }
 
 MediaRouterDialogController::~MediaRouterDialogController() {
   DCHECK(thread_checker_.CalledOnValidThread());
 }
 
 bool MediaRouterDialogController::ShowMediaRouterDialogForPresentation(
-    scoped_ptr<CreatePresentationConnectionRequest> request) {
+    scoped_ptr<CreatePresentationSessionRequest> request) {
   DCHECK(thread_checker_.CalledOnValidThread());
 
   // Check if the media router dialog exists for |initiator| and return if so.
   if (IsShowingMediaRouterDialog())
     return false;
 
-  create_connection_request_ = request.Pass();
+  presentation_request_ = request.Pass();
   CreateMediaRouterDialog();
 
   // Show the initiator holding the existing media router dialog.
   ActivateInitiatorWebContents();
 
   media_router::MediaRouterMetrics::RecordMediaRouterDialogOrigin(
       media_router::PAGE);
 
   return true;
 }
@@ skipping 13 matching lines @@
 void MediaRouterDialogController::HideMediaRouterDialog() {
   DCHECK(thread_checker_.CalledOnValidThread());
   CloseMediaRouterDialog();
   Reset();
 }
 
 void MediaRouterDialogController::ActivateInitiatorWebContents() {
   initiator_->GetDelegate()->ActivateContents(initiator_);
 }
 
-scoped_ptr<CreatePresentationConnectionRequest>
-MediaRouterDialogController::TakeCreateConnectionRequest() {
-  return create_connection_request_.Pass();
+scoped_ptr<CreatePresentationSessionRequest>
+MediaRouterDialogController::TakePresentationRequest() {
+  return presentation_request_.Pass();
 }
 
 void MediaRouterDialogController::Reset() {
   initiator_observer_.reset();
-  create_connection_request_.reset();
+  presentation_request_.reset();
 }
 
 }  // namespace media_router