Change the functions in video_capture_device to pass around PowerLineFrequency enums instead of int…

media/capture/video/video_capture_device.cc

Index: media/capture/video/video_capture_device.cc
diff --git a/media/capture/video/video_capture_device.cc b/media/capture/video/video_capture_device.cc
index 4b771e564ee9c05c0641bd14b5174cd4d005f6b6..540f3ad6edd3664bd7c7a70dfaed1628c6bc2a37 100644
--- a/media/capture/video/video_capture_device.cc
+++ b/media/capture/video/video_capture_device.cc
@@ -138,10 +138,11 @@ VideoCaptureDevice::Client::Buffer::~Buffer() {
 VideoCaptureDevice::~VideoCaptureDevice() {
 }
 
-int VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
-  std::string current_country = base::CountryCodeForCurrentTimezone();
+PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequencyForLocation()
+    const {
+  const std::string current_country = base::CountryCodeForCurrentTimezone();

[mcasas, 2015/10/02 19:02:41]

Nice!

   if (current_country.empty())
-    return 0;
+    return PowerLineFrequency::FREQUENCY_DEFAULT;
   // Sorted out list of countries with 60Hz power line frequency, from
   // http://en.wikipedia.org/wiki/Mains_electricity_by_country
   const char* countries_using_60Hz[] = {
@@ -153,17 +154,17 @@ int VideoCaptureDevice::GetPowerLineFrequencyForLocation() const {
       countries_using_60Hz + arraysize(countries_using_60Hz);
   if (std::find(countries_using_60Hz, countries_using_60Hz_end,
                 current_country) == countries_using_60Hz_end) {
-    return static_cast<int>(media::PowerLineFrequency::FREQUENCY_50HZ);
+    return media::PowerLineFrequency::FREQUENCY_50HZ;
   }
-  return static_cast<int>(media::PowerLineFrequency::FREQUENCY_60HZ);
+  return media::PowerLineFrequency::FREQUENCY_60HZ;
 }
 
-int VideoCaptureDevice::GetPowerLineFrequency(
+PowerLineFrequency VideoCaptureDevice::GetPowerLineFrequency(
     const VideoCaptureParams& params) const {
   switch (params.power_line_frequency) {
     case media::PowerLineFrequency::FREQUENCY_50HZ:  // fall through
     case media::PowerLineFrequency::FREQUENCY_60HZ:
-      return static_cast<int>(params.power_line_frequency);
+      return params.power_line_frequency;
     default:
       return GetPowerLineFrequencyForLocation();
   }