Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(362)

Side by Side Diff: chrome/browser/media/chrome_webrtc_video_quality_browsertest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix bad merge Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/base64.h" 5 #include "base/base64.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/environment.h" 7 #include "base/environment.h"
8 #include "base/file_util.h"
9 #include "base/files/file.h" 8 #include "base/files/file.h"
9 #include "base/files/file_util.h"
10 #include "base/files/scoped_temp_dir.h" 10 #include "base/files/scoped_temp_dir.h"
11 #include "base/path_service.h" 11 #include "base/path_service.h"
12 #include "base/process/launch.h" 12 #include "base/process/launch.h"
13 #include "base/strings/string_number_conversions.h" 13 #include "base/strings/string_number_conversions.h"
14 #include "base/strings/string_split.h" 14 #include "base/strings/string_split.h"
15 #include "base/strings/stringprintf.h" 15 #include "base/strings/stringprintf.h"
16 #include "base/test/test_timeouts.h" 16 #include "base/test/test_timeouts.h"
17 #include "base/time/time.h" 17 #include "base/time/time.h"
18 #include "chrome/browser/chrome_notification_types.h" 18 #include "chrome/browser/chrome_notification_types.h"
19 #include "chrome/browser/infobars/infobar_service.h" 19 #include "chrome/browser/infobars/infobar_service.h"
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 ASSERT_TRUE(CompareVideosAndPrintResult( 326 ASSERT_TRUE(CompareVideosAndPrintResult(
327 test_config_.test_name, 327 test_config_.test_name,
328 test_config_.width, 328 test_config_.width,
329 test_config_.height, 329 test_config_.height,
330 GetWorkingDir().Append(kCapturedYuvFileName), 330 GetWorkingDir().Append(kCapturedYuvFileName),
331 test::GetReferenceFilesDir() 331 test::GetReferenceFilesDir()
332 .Append(test_config_.reference_video) 332 .Append(test_config_.reference_video)
333 .AddExtension(test::kYuvFileExtension), 333 .AddExtension(test::kYuvFileExtension),
334 GetWorkingDir().Append(kStatsFileName))); 334 GetWorkingDir().Append(kStatsFileName)));
335 } 335 }
OLDNEW
« no previous file with comments | « chrome/browser/media/chrome_webrtc_perf_browsertest.cc ('k') | chrome/browser/media/test_license_server.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698