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

chrome/browser/media/router/media_router_dialog_controller.h

 // 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.
 
 #ifndef CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_H_
 #define CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_H_
 
 #include <string>
 
 #include "base/macros.h"
@@ skipping 49 matching lines @@
   explicit MediaRouterDialogController(content::WebContents* initiator);
 
   // Activates the WebContents that initiated the dialog, e.g. focuses the tab.
   void ActivateInitiatorWebContents();
 
   // Passes the ownership of the CreatePresentationSessionRequest to the caller.
   scoped_ptr<CreatePresentationSessionRequest> TakePresentationRequest();
 
   // Returns the CreatePresentationSessionRequest to the caller but keeps the
   // ownership with the MediaRouterDialogController.
-  const CreatePresentationSessionRequest* presentation_request() const {
-    return presentation_request_.get();
+  const CreatePresentationSessionRequest* create_session_request() const {
+    return create_session_request_.get();
   }
 
   // Returns the WebContents that initiated showing the dialog.
   content::WebContents* initiator() const { return initiator_; }
 
   // Resets the state of the controller. Must be called from the overrides.
   virtual void Reset();
   // Creates a new media router dialog modal to |initiator_|.
   virtual void CreateMediaRouterDialog() = 0;
   // Closes the media router dialog if it exists.
   virtual void CloseMediaRouterDialog() = 0;
 
   base::ThreadChecker thread_checker_;
 
  private:
   class InitiatorWebContentsObserver;
 
   // An observer for the |initiator_| that closes the dialog when |initiator_|
   // is destroyed or navigated.
   scoped_ptr<InitiatorWebContentsObserver> initiator_observer_;
   content::WebContents* const initiator_;
 
   // Data for dialogs created at the request of the Presentation API.
   // Passed from the caller via ShowMediaRouterDialogForPresentation to the
   // dialog when it is initialized.
-  scoped_ptr<CreatePresentationSessionRequest> presentation_request_;
+  scoped_ptr<CreatePresentationSessionRequest> create_session_request_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaRouterDialogController);
 };
 
 }  // namespace media_router
 
 #endif  // CHROME_BROWSER_MEDIA_ROUTER_MEDIA_ROUTER_DIALOG_CONTROLLER_H_