SPDY - don't persist SpdySettings until we convert it to a map.

net/spdy/spdy_network_transaction_spdy2_unittest.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 "net/http/http_network_transaction.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 4071 matching lines @@
       new DelayedSocketData(1, reads, arraysize(reads),
                             writes, arraysize(writes)));
   helper.AddData(data.get());
   helper.RunDefaultTest();
   helper.VerifyDataConsumed();
   TransactionHelperResult out = helper.output();
   EXPECT_EQ(OK, out.rv);
   EXPECT_EQ("HTTP/1.1 200 OK", out.status_line);
   EXPECT_EQ("hello!", out.response_data);
 
+  // TODO(rtenneti): Persist spdy settings.
+#ifdef PERSIST_SPDY_SETTINGS
   {
     // Verify we had two persisted settings.
     spdy::SpdySettings saved_settings =
         spdy_session_pool->http_server_properties()->GetSpdySettings(
             host_port_pair);
     ASSERT_EQ(2u, saved_settings.size());
 
     // Verify the first persisted setting.
     spdy::SpdySetting setting = saved_settings.front();
     saved_settings.pop_front();
     EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, setting.first.flags());
     EXPECT_EQ(kSampleId1, setting.first.id());
     EXPECT_EQ(kSampleValue1, setting.second);
 
     // Verify the second persisted setting.
     setting = saved_settings.front();
     saved_settings.pop_front();
     EXPECT_EQ(spdy::SETTINGS_FLAG_PERSISTED, setting.first.flags());
     EXPECT_EQ(kSampleId3, setting.first.id());
     EXPECT_EQ(kSampleValue3, setting.second);
   }
+#endif
 }
 
 // Test that when there are settings saved that they are sent back to the
 // server upon session establishment.
 TEST_P(SpdyNetworkTransactionSpdy2Test, SettingsPlayback) {
   static const SpdyHeaderInfo kSynReplyInfo = {
     spdy::SYN_REPLY,                              // Syn Reply
     1,                                            // Stream ID
     0,                                            // Associated Stream ID
     net::ConvertRequestPriorityToSpdyPriority(LOWEST),
@@ skipping 1375 matching lines @@
                                     << " Write index: "
                                     << data->write_index();
 
   // Verify the SYN_REPLY.
   HttpResponseInfo response = *trans->GetResponseInfo();
   EXPECT_TRUE(response.headers != NULL);
   EXPECT_EQ("HTTP/1.1 200 OK", response.headers->GetStatusLine());
 }
 
 }  // namespace net