Presentation API: ignore presentation id passed to startSession().

content/browser/presentation/presentation_service_impl_unittest.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 "base/location.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/test/test_timeouts.h"
 #include "base/thread_task_runner_handle.h"
@@ skipping 65 matching lines @@
   MOCK_METHOD2(Reset,
       void(
           int render_process_id,
           int routing_id));
   MOCK_METHOD4(SetDefaultPresentationUrl,
       void(
           int render_process_id,
           int routing_id,
           const std::string& default_presentation_url,
           const std::string& default_presentation_id));
-  MOCK_METHOD6(StartSession,
+  MOCK_METHOD5(StartSession,
       void(
           int render_process_id,
           int render_frame_id,
           const std::string& presentation_url,
-          const std::string& presentation_id,
           const PresentationSessionSuccessCallback& success_cb,
           const PresentationSessionErrorCallback& error_cb));
   MOCK_METHOD6(JoinSession,
       void(
           int render_process_id,
           int render_frame_id,
           const std::string& presentation_url,
           const std::string& presentation_id,
           const PresentationSessionSuccessCallback& success_cb,
           const PresentationSessionErrorCallback& error_cb));
@@ skipping 354 matching lines @@
 
   // Same URL as before; no-ops.
   service_impl_->SetDefaultPresentationURL(kPresentationUrl, dpu_id);
   EXPECT_TRUE(Mock::VerifyAndClearExpectations(&mock_delegate_));
   EXPECT_EQ(kPresentationUrl, service_impl_->default_presentation_url_);
 }
 
 TEST_F(PresentationServiceImplTest, StartSessionSuccess) {
   service_ptr_->StartSession(
       kPresentationUrl,
-      kPresentationId,
       base::Bind(
           &PresentationServiceImplTest::ExpectNewSessionMojoCallbackSuccess,
           base::Unretained(this)));
   base::RunLoop run_loop;
   base::Callback<void(const PresentationSessionInfo&)> success_cb;
-  EXPECT_CALL(mock_delegate_, StartSession(
-      _, _, Eq(kPresentationUrl), Eq(kPresentationId), _, _))
+  EXPECT_CALL(mock_delegate_, StartSession(_, _, Eq(kPresentationUrl), _, _))
       .WillOnce(DoAll(
             InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit),
-            SaveArg<4>(&success_cb)));
+            SaveArg<3>(&success_cb)));
   run_loop.Run();
   success_cb.Run(PresentationSessionInfo(kPresentationUrl, kPresentationId));
   SaveQuitClosureAndRunLoop();
 }
 
 TEST_F(PresentationServiceImplTest, StartSessionError) {
   service_ptr_->StartSession(
       kPresentationUrl,
-      kPresentationId,
       base::Bind(
           &PresentationServiceImplTest::ExpectNewSessionMojoCallbackError,
           base::Unretained(this)));
   base::RunLoop run_loop;
   base::Callback<void(const PresentationError&)> error_cb;
-  EXPECT_CALL(mock_delegate_, StartSession(
-      _, _, Eq(kPresentationUrl), Eq(kPresentationId), _, _))
+  EXPECT_CALL(mock_delegate_, StartSession(_, _, Eq(kPresentationUrl), _, _))
       .WillOnce(DoAll(
             InvokeWithoutArgs(&run_loop, &base::RunLoop::Quit),
-            SaveArg<5>(&error_cb)));
+            SaveArg<4>(&error_cb)));
   run_loop.Run();
   error_cb.Run(PresentationError(PRESENTATION_ERROR_UNKNOWN, "Error message"));
   SaveQuitClosureAndRunLoop();
 }
 
 TEST_F(PresentationServiceImplTest, JoinSessionSuccess) {
   service_ptr_->JoinSession(
       kPresentationUrl,
       kPresentationId,
       base::Bind(
@@ skipping 71 matching lines @@
       kPresentationUrl, kPresentationId,
       scoped_ptr<std::string>(new std::string(text_msg))));
   ExpectReset();
   service_impl_->Reset();
   message_cb.Run(messages.Pass());
   SaveQuitClosureAndRunLoop();
 }
 
 TEST_F(PresentationServiceImplTest, StartSessionInProgress) {
   std::string presentation_url1("http://fooUrl");
-  std::string presentation_id1("presentationId1");
   std::string presentation_url2("http://barUrl");
-  std::string presentation_id2("presentationId2");
-  service_ptr_->StartSession(presentation_url1, presentation_id1,
+  service_ptr_->StartSession(presentation_url1,
                              base::Bind(&DoNothing));
   // This request should fail immediately, since there is already a StartSession
   // in progress.
   service_ptr_->StartSession(
-      presentation_url2, presentation_id2,
+      presentation_url2,
       base::Bind(
           &PresentationServiceImplTest::ExpectNewSessionMojoCallbackError,
           base::Unretained(this)));
   SaveQuitClosureAndRunLoop();
 }
 
 TEST_F(PresentationServiceImplTest, ListenForDefaultSessionStart) {
   presentation::PresentationSessionInfo expected_session;
   expected_session.url = kPresentationUrl;
   expected_session.id = kPresentationId;
@@ skipping 229 matching lines @@
   service_ptr_->JoinSession(
         base::StringPrintf(presentation_url, i),
         base::StringPrintf(presentation_id, i),
         base::Bind(
             &PresentationServiceImplTest::ExpectNewSessionMojoCallbackError,
             base::Unretained(this)));
   SaveQuitClosureAndRunLoop();
 }
 
 }  // namespace content