Remove duplicate CPU detection code; use base::CPU instead.

media/base/simd/convert_rgb_to_yuv_unittest.cc

 // Copyright (c) 2011 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 "base/cpu.h"
 #include "base/memory/scoped_ptr.h"
-#include "media/base/cpu_features.h"
 #include "media/base/simd/convert_rgb_to_yuv.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Reference code that converts RGB pixels to YUV pixels.
 int ConvertRGBToY(const uint8* rgb) {
   int y = 25 * rgb[0] + 129 * rgb[1] + 66 * rgb[2];
   y = ((y + 128) >> 8) + 16;
   return std::max(0, std::min(255, y));
@@ skipping 28 matching lines @@
 }  // namespace
 
 // A side-by-side test that verifies our ASM functions that convert RGB pixels
 // to YUV pixels can output the expected results. This test converts RGB pixels
 // to YUV pixels with our ASM functions (which use SSE, SSE2, SSE3, and SSSE3)
 // and compare the output YUV pixels with the ones calculated with out reference
 // functions implemented in C++.
 TEST(YUVConvertTest, SideBySideRGB) {
   // We skip this test on PCs which does not support SSE3 because this test
   // needs it.
-  if (!media::hasSSSE3())
+  base::CPU cpu;
+  if (!cpu.has_ssse3())
     return;
 
   // This test checks a subset of all RGB values so this test does not take so
   // long time.
   const int kStep = 8;
   const int kWidth = 256 / kStep;
 
 #ifdef ENABLE_SUBSAMPLING
   const bool kSubsampling = true;
 #else
@@ skipping 51 matching lines @@
           const uint8* p = &rgb[i * 2 * size];
           int error = ConvertRGBToV(p, size, kSubsampling) - v[i];
           total_error += error > 0 ? error : -error;
         }
       }
     }
 
     EXPECT_EQ(0, total_error);
   }
 }