summaryrefslogtreecommitdiffstats
path: root/media/ffmpeg
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-24 15:09:45 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-08-24 15:09:45 +0000
commitbb5c95c9bff8920f56d1737b27e2eb1ae99c54ad (patch)
tree08bf4704252fdfc8fcb286a208c691d7d3045c33 /media/ffmpeg
parentab612c5e4139b7ab5be53f063efc1739bc452137 (diff)
downloadchromium_src-bb5c95c9bff8920f56d1737b27e2eb1ae99c54ad.zip
chromium_src-bb5c95c9bff8920f56d1737b27e2eb1ae99c54ad.tar.gz
chromium_src-bb5c95c9bff8920f56d1737b27e2eb1ae99c54ad.tar.bz2
Move perftimer.* into base/test/ directory.
This should address the TODO from tools/gn/secondary/base/BUILD.gn BUG=None TEST=test_support_perf R=brettw@chromium.org TBR=cpu, dalecurtis, akalin, thestig Review URL: https://chromiumcodereview.appspot.com/22887041 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@219448 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/ffmpeg')
-rw-r--r--media/ffmpeg/ffmpeg_unittest.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/media/ffmpeg/ffmpeg_unittest.cc b/media/ffmpeg/ffmpeg_unittest.cc
index d774a06..3557ada 100644
--- a/media/ffmpeg/ffmpeg_unittest.cc
+++ b/media/ffmpeg/ffmpeg_unittest.cc
@@ -17,9 +17,9 @@
#include "base/files/memory_mapped_file.h"
#include "base/memory/scoped_ptr.h"
#include "base/path_service.h"
-#include "base/perftimer.h"
#include "base/strings/string_util.h"
#include "base/test/perf_test_suite.h"
+#include "base/test/perftimer.h"
#include "media/base/media.h"
#include "media/ffmpeg/ffmpeg_common.h"
#include "media/filters/ffmpeg_glue.h"