Refactor serialisation of openerId & openerNavigationIndex.

ios/web/webui/web_ui_mojo_inttest.mm

 // Copyright 2016 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 <memory>
 
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #import "base/test/ios/wait_util.h"
 #import "ios/web/public/navigation_manager.h"
@@ skipping 116 matching lines @@
   TestUIHandler* ui_handler_;
 };
 }  // namespace
 
 // A test fixture for verifying mojo comminication for WebUI.
 class WebUIMojoTest : public WebIntTest {
  protected:
   WebUIMojoTest()
       : web_state_(new WebStateImpl(GetBrowserState())),
         ui_handler_(new TestUIHandler()) {
-    web_state_->GetNavigationManagerImpl().InitializeSession(nil, nil, NO, 0);
+    web_state_->GetNavigationManagerImpl().InitializeSession(nil, NO);
     WebUIIOSControllerFactory::RegisterFactory(
         new TestWebUIControllerFactory(ui_handler_.get()));
   }
 
   // Returns WebState which loads test WebUI page.
   WebStateImpl* web_state() { return web_state_.get(); }
   // Returns UI handler which communicates with WebUI page.
   TestUIHandler* test_ui_handler() { return ui_handler_.get(); }
 
  private:
@@ skipping 12 matching lines @@
   web_state()->GetNavigationManager()->LoadURLWithParams(load_params);
 
   // Wait until |TestUIHandler| receives "ack" message from WebUI page.
   base::test::ios::WaitUntilCondition(^{
     base::RunLoop().RunUntilIdle();
     return test_ui_handler()->IsFinReceived();
   });
 }
 
 }  // namespace web