Switch to standard integer types in content/browser/.

content/browser/geolocation/wifi_data_provider_linux_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 "content/browser/geolocation/wifi_data_provider_linux.h"
 
+#include <stdint.h>
+
+#include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "dbus/message.h"
 #include "dbus/mock_bus.h"
 #include "dbus/mock_object_proxy.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ skipping 162 matching lines @@
       dbus::MessageReader reader(method_call);
 
       std::string interface_name;
       std::string property_name;
       if (reader.PopString(&interface_name) &&
           reader.PopString(&property_name)) {
         scoped_ptr<dbus::Response> response = dbus::Response::CreateEmpty();
         dbus::MessageWriter writer(response.get());
 
         if (property_name == "Ssid") {
-          const uint8 kSsid[] = {0x74, 0x65, 0x73, 0x74};  // "test"
+          const uint8_t kSsid[] = {0x74, 0x65, 0x73, 0x74};  // "test"
           dbus::MessageWriter variant_writer(response.get());
           writer.OpenVariant("ay", &variant_writer);
           variant_writer.AppendArrayOfBytes(kSsid, arraysize(kSsid));
           writer.CloseContainer(&variant_writer);
         } else if (property_name == "HwAddress") {
           // This will be converted to "00-11-22-33-44-55".
           const std::string kMacAddress = "00:11:22:33:44:55";
           writer.AppendVariantOfString(kMacAddress);
         } else if (property_name == "Strength") {
           // This will be converted to -50.
-          const uint8 kStrength = 100;
+          const uint8_t kStrength = 100;
           writer.AppendVariantOfByte(kStrength);
         } else if (property_name == "Frequency") {
           // This will be converted to channel 4.
-          const uint32 kFrequency = 2427;
+          const uint32_t kFrequency = 2427;
           writer.AppendVariantOfUint32(kFrequency);
         }
         return response.release();
       }
     }
 
     LOG(ERROR) << "Unexpected method call: " << method_call->ToString();
     return NULL;
   }
 };
 
 TEST_F(GeolocationWifiDataProviderLinuxTest, GetAccessPointData) {
   WifiData::AccessPointDataSet access_point_data_set;
   ASSERT_TRUE(wlan_api_->GetAccessPointData(&access_point_data_set));
 
   ASSERT_EQ(1U, access_point_data_set.size());
   AccessPointData access_point_data = *access_point_data_set.begin();
 
   // Check the contents of the access point data.
   // The expected values come from CreateAccessPointProxyResponse() above.
   EXPECT_EQ("test", base::UTF16ToUTF8(access_point_data.ssid));
   EXPECT_EQ("00-11-22-33-44-55",
             base::UTF16ToUTF8(access_point_data.mac_address));
   EXPECT_EQ(-50, access_point_data.radio_signal_strength);
   EXPECT_EQ(4, access_point_data.channel);
 }
 
 }  // namespace content