Switch to standard integer types in net/.

net/http/http_server_properties_impl_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_server_properties_impl.h"
 
 #include <string>
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/containers/hash_tables.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/ip_address_number.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace base {
 class ListValue;
@@ skipping 23 matching lines @@
 }
 
 namespace {
 
 const int kMaxSupportsSpdyServerHosts = 500;
 const SpdySettingsIds kSpdySettingsId = SETTINGS_UPLOAD_BANDWIDTH;
 const SpdySettingsFlags kSpdySettingsFlags = SETTINGS_FLAG_PERSISTED;
 
 struct SpdySettingsDataToVerify {
   HostPortPair spdy_server;
-  uint32 value;
+  uint32_t value;
 };
 
 class HttpServerPropertiesImplTest : public testing::Test {
  protected:
   bool HasAlternativeService(const HostPortPair& origin) {
     const AlternativeServiceVector alternative_service_vector =
         impl_.GetAlternativeServices(origin);
     return !alternative_service_vector.empty();
   }
 
   bool SetAlternativeService(const HostPortPair& origin,
                              const AlternativeService& alternative_service,
                              double alternative_probability) {
     const base::Time expiration =
         base::Time::Now() + base::TimeDelta::FromDays(1);
     return impl_.SetAlternativeService(origin, alternative_service,
                                        alternative_probability, expiration);
   }
 
   void InitializeSpdySettingsUploadBandwidth(SpdySettingsMap* spdy_settings_map,
                                              const HostPortPair& spdy_server,
-                                             uint32 value) {
+                                             uint32_t value) {
     SettingsMap settings_map;
     settings_map[kSpdySettingsId] =
         SettingsFlagsAndValue(kSpdySettingsFlags, value);
     spdy_settings_map->Put(spdy_server, settings_map);
   }
 
   void VerifySpdySettingsUploadBandwidth(
       const SpdySettingsDataToVerify* data_to_verify) {
     const SpdySettingsMap& spdy_settings_map = impl_.spdy_settings_map();
     int count = 0;
@@ skipping 1015 matching lines @@
 
 TEST_F(SpdySettingsServerPropertiesTest, SetSpdySetting) {
   HostPortPair spdy_server_empty(std::string(), 443);
   const SettingsMap& settings_map0 = impl_.GetSpdySettings(spdy_server_empty);
   EXPECT_EQ(0U, settings_map0.size());  // Returns kEmptySettingsMap.
 
   // Add www.google.com:443 as persisting.
   HostPortPair spdy_server_google("www.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value1 = 31337;
+  const uint32_t value1 = 31337;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
   // Check the values.
   const SettingsMap& settings_map1_ret =
       impl_.GetSpdySettings(spdy_server_google);
   ASSERT_EQ(1U, settings_map1_ret.size());
   SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
   EXPECT_TRUE(it1_ret != settings_map1_ret.end());
   SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
   EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
   EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   // Add mail.google.com:443 as not persisting.
   HostPortPair spdy_server_mail("mail.google.com", 443);
   const SpdySettingsIds id2 = SETTINGS_DOWNLOAD_BANDWIDTH;
   const SpdySettingsFlags flags2 = SETTINGS_FLAG_NONE;
-  const uint32 value2 = 62667;
+  const uint32_t value2 = 62667;
   EXPECT_FALSE(impl_.SetSpdySetting(spdy_server_mail, id2, flags2, value2));
   const SettingsMap& settings_map2_ret =
       impl_.GetSpdySettings(spdy_server_mail);
   EXPECT_EQ(0U, settings_map2_ret.size());  // Returns kEmptySettingsMap.
 
   // Add docs.google.com:443 as persisting
   HostPortPair spdy_server_docs("docs.google.com", 443);
   const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;
   const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value3 = 93997;
+  const uint32_t value3 = 93997;
   SettingsFlagsAndValue flags_and_value3(flags3, value3);
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags3, value3));
   // Check the values.
   const SettingsMap& settings_map3_ret =
       impl_.GetSpdySettings(spdy_server_docs);
   ASSERT_EQ(1U, settings_map3_ret.size());
   SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
   EXPECT_TRUE(it3_ret != settings_map3_ret.end());
   SettingsFlagsAndValue flags_and_value3_ret = it3_ret->second;
   EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value3_ret.first);
@@ skipping 20 matching lines @@
   ASSERT_GT(impl_.spdy_settings_map().size(), 0U);
   impl_.ClearAllSpdySettings();
   ASSERT_EQ(0U, impl_.spdy_settings_map().size());
 }
 
 TEST_F(SpdySettingsServerPropertiesTest, Clear) {
   // Add www.google.com:443 as persisting.
   HostPortPair spdy_server_google("www.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value1 = 31337;
+  const uint32_t value1 = 31337;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
   // Check the values.
   const SettingsMap& settings_map1_ret =
       impl_.GetSpdySettings(spdy_server_google);
   ASSERT_EQ(1U, settings_map1_ret.size());
   SettingsMap::const_iterator it1_ret = settings_map1_ret.find(id1);
   EXPECT_TRUE(it1_ret != settings_map1_ret.end());
   SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
   EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
   EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   // Add docs.google.com:443 as persisting
   HostPortPair spdy_server_docs("docs.google.com", 443);
   const SpdySettingsIds id3 = SETTINGS_ROUND_TRIP_TIME;
   const SpdySettingsFlags flags3 = SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value3 = 93997;
+  const uint32_t value3 = 93997;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id3, flags3, value3));
   // Check the values.
   const SettingsMap& settings_map3_ret =
       impl_.GetSpdySettings(spdy_server_docs);
   ASSERT_EQ(1U, settings_map3_ret.size());
   SettingsMap::const_iterator it3_ret = settings_map3_ret.find(id3);
   EXPECT_TRUE(it3_ret != settings_map3_ret.end());
   SettingsFlagsAndValue flags_and_value3_ret = it3_ret->second;
   EXPECT_EQ(SETTINGS_FLAG_PERSISTED, flags_and_value3_ret.first);
   EXPECT_EQ(value3, flags_and_value3_ret.second);
 
   impl_.Clear();
   EXPECT_EQ(0U, impl_.GetSpdySettings(spdy_server_google).size());
   EXPECT_EQ(0U, impl_.GetSpdySettings(spdy_server_docs).size());
 }
 
 TEST_F(SpdySettingsServerPropertiesTest, MRUOfGetSpdySettings) {
   // Add www.google.com:443 as persisting.
   HostPortPair spdy_server_google("www.google.com", 443);
   const SpdySettingsIds id1 = SETTINGS_UPLOAD_BANDWIDTH;
   const SpdySettingsFlags flags1 = SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value1 = 31337;
+  const uint32_t value1 = 31337;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_google, id1, flags1, value1));
 
   // Add docs.google.com:443 as persisting
   HostPortPair spdy_server_docs("docs.google.com", 443);
   const SpdySettingsIds id2 = SETTINGS_ROUND_TRIP_TIME;
   const SpdySettingsFlags flags2 = SETTINGS_FLAG_PLEASE_PERSIST;
-  const uint32 value2 = 93997;
+  const uint32_t value2 = 93997;
   EXPECT_TRUE(impl_.SetSpdySetting(spdy_server_docs, id2, flags2, value2));
 
   // Verify the first element is docs.google.com:443.
   const SpdySettingsMap& map = impl_.spdy_settings_map();
   SpdySettingsMap::const_iterator it = map.begin();
   EXPECT_TRUE(it->first.Equals(spdy_server_docs));
   const SettingsMap& settings_map2_ret = it->second;
   ASSERT_EQ(1U, settings_map2_ret.size());
   SettingsMap::const_iterator it2_ret = settings_map2_ret.find(id2);
   EXPECT_TRUE(it2_ret != settings_map2_ret.end());
@@ skipping 229 matching lines @@
   EXPECT_EQ(quic_server_info1, *(impl_.GetQuicServerInfo(quic_server_id)));
 
   impl_.Clear();
   EXPECT_EQ(0u, impl_.quic_server_info_map().size());
   EXPECT_EQ(nullptr, impl_.GetQuicServerInfo(quic_server_id));
 }
 
 }  // namespace
 
 }  // namespace net