Use struct AlternativeService in OnAltSvc() and OnSpdyAltSvc() methods.

net/spdy/spdy_framer_test.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <iostream>
 #include <limits>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 409 matching lines @@
     ++push_promise_frame_count_;
     InitHeaderStreaming(PUSH_PROMISE, stream_id);
     last_push_promise_stream_ = stream_id;
     last_push_promise_promised_stream_ = promised_stream_id;
   }
 
   void OnContinuation(SpdyStreamId stream_id, bool end) override {
     ++continuation_count_;
   }
 
-  void OnAltSvc(SpdyStreamId stream_id,
-                uint32 max_age,
-                uint16 port,
-                StringPiece protocol_id,
-                StringPiece host,
-                StringPiece origin) override {
+  void OnAltSvc(
+      SpdyStreamId stream_id,
+      StringPiece origin,
+      const SpdyAltSvcWireFormat::AlternativeService& altsvc) override {
     test_altsvc_ir_.set_stream_id(stream_id);
-    test_altsvc_ir_.set_max_age(max_age);
-    test_altsvc_ir_.set_port(port);
-    test_altsvc_ir_.set_protocol_id(protocol_id.as_string());
-    test_altsvc_ir_.set_host(host.as_string());
     if (origin.length() > 0) {
       test_altsvc_ir_.set_origin(origin.as_string());
     }
+    test_altsvc_ir_.set_protocol_id(altsvc.protocol_id);
+    test_altsvc_ir_.set_host(altsvc.host);
+    test_altsvc_ir_.set_port(altsvc.port);
+    test_altsvc_ir_.set_max_age(altsvc.max_age);
+    test_altsvc_ir_.set_p(altsvc.p);
     ++altsvc_count_;
   }
 
   void OnPriority(SpdyStreamId stream_id,
                   SpdyStreamId parent_stream_id,
                   uint8 weight,
                   bool exclusive) override {
     ++priority_count_;
   }
 
@@ skipping 5233 matching lines @@
   if (spdy_version_ <= SPDY3) {
     return;
   }
 
   const SpdyStreamId kStreamId = 1;
 
   testing::StrictMock<test::MockSpdyFramerVisitor> visitor;
   SpdyFramer framer(spdy_version_);
   framer.set_visitor(&visitor);
 
-  EXPECT_CALL(visitor, OnAltSvc(kStreamId,
-                                10,
-                                443,
-                                StringPiece("pid"),
-                                StringPiece("h1"),
-                                StringPiece("o1")));
+  SpdyAltSvcWireFormat::AlternativeService altsvc;
+  altsvc.protocol_id = "p\"=i:d";
+  altsvc.host = "h_\\o\"st";
+  altsvc.port = 443;
+  altsvc.max_age = 10;
+  altsvc.p = 1.0;
+  EXPECT_CALL(visitor, OnAltSvc(kStreamId, StringPiece("o_r|g!n"), altsvc));
 
   SpdyAltSvcIR altsvc_ir(1);
   altsvc_ir.set_max_age(10);
   altsvc_ir.set_port(443);
-  altsvc_ir.set_protocol_id("pid");
-  altsvc_ir.set_host("h1");
-  altsvc_ir.set_origin("o1");
+  altsvc_ir.set_protocol_id("p\"=i:d");
+  altsvc_ir.set_host("h_\\o\"st");
+  altsvc_ir.set_origin("o_r|g!n");
   scoped_ptr<SpdySerializedFrame> frame(framer.SerializeFrame(altsvc_ir));
   framer.ProcessInput(frame->data(), frame->size());
 
   EXPECT_EQ(SpdyFramer::SPDY_RESET, framer.state());
   EXPECT_EQ(SpdyFramer::SPDY_NO_ERROR, framer.error_code())
       << SpdyFramer::ErrorCodeToString(framer.error_code());
 }
 
 TEST_P(SpdyFramerTest, OnAltSvcNoOrigin) {
   if (spdy_version_ <= SPDY3) {
     return;
   }
 
   const SpdyStreamId kStreamId = 1;
 
   testing::StrictMock<test::MockSpdyFramerVisitor> visitor;
   SpdyFramer framer(spdy_version_);
   framer.set_visitor(&visitor);
 
-  EXPECT_CALL(visitor,
-              OnAltSvc(kStreamId, 10, 443, StringPiece("p\"=i:d"),
-                       StringPiece("h_\\o\"st"), StringPiece("o_r|g!n")));
+  SpdyAltSvcWireFormat::AlternativeService altsvc;
+  altsvc.protocol_id = "p\"=i:d";
+  altsvc.host = "h_\\o\"st";
+  altsvc.port = 443;
+  altsvc.max_age = 10;
+  altsvc.p = 1.0;
+  EXPECT_CALL(visitor, OnAltSvc(kStreamId, StringPiece(""), altsvc));
 
   SpdyAltSvcIR altsvc_ir(1);
   altsvc_ir.set_max_age(10);
   altsvc_ir.set_port(443);
   altsvc_ir.set_protocol_id("p\"=i:d");
   altsvc_ir.set_host("h_\\o\"st");
-  altsvc_ir.set_origin("o_r|g!n");
   scoped_ptr<SpdySerializedFrame> frame(framer.SerializeFrame(altsvc_ir));
   framer.ProcessInput(frame->data(), frame->size());
 
   EXPECT_EQ(SpdyFramer::SPDY_RESET, framer.state());
   EXPECT_EQ(SpdyFramer::SPDY_NO_ERROR, framer.error_code())
       << SpdyFramer::ErrorCodeToString(framer.error_code());
 }
 
 TEST_P(SpdyFramerTest, OnAltSvcEmptyProtocolId) {
   if (spdy_version_ <= SPDY3) {
@@ skipping 23 matching lines @@
   if (spdy_version_ <= SPDY3) {
     return;
   }
 
   const SpdyStreamId kStreamId = 1;
 
   testing::StrictMock<test::MockSpdyFramerVisitor> visitor;
   SpdyFramer framer(spdy_version_);
   framer.set_visitor(&visitor);
 
-  EXPECT_CALL(visitor, OnAltSvc(kStreamId, 10, 443, StringPiece("pid"),
-                                StringPiece("h1"), StringPiece("")));
+  SpdyAltSvcWireFormat::AlternativeService altsvc;
+  altsvc.protocol_id = "pid";
+  altsvc.host = "h1";
+  altsvc.port = 443;
+  altsvc.max_age = 10;
+  altsvc.p = 1.0;
+  EXPECT_CALL(visitor, OnAltSvc(kStreamId, StringPiece(""), altsvc));
 
   SpdyAltSvcIR altsvc_ir(1);
   altsvc_ir.set_max_age(10);
   altsvc_ir.set_port(443);
   altsvc_ir.set_protocol_id("pid");
   altsvc_ir.set_host("h1");
   scoped_ptr<SpdySerializedFrame> frame(framer.SerializeFrame(altsvc_ir));
   framer.ProcessInput(frame->data(), frame->size());
 
   EXPECT_EQ(SpdyFramer::SPDY_RESET, framer.state());
@@ skipping 108 matching lines @@
 
   EXPECT_EQ(SpdyFramer::SPDY_ERROR, visitor.framer_.state());
   EXPECT_EQ(SpdyFramer::SPDY_INVALID_CONTROL_FRAME,
             visitor.framer_.error_code())
       << SpdyFramer::ErrorCodeToString(visitor.framer_.error_code());
 }
 
 }  // namespace test
 
 }  // namespace net