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

Side by Side Diff: chrome/browser/media/webrtc_log_uploader_unittest.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, 3 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
« no previous file with comments | « chrome/browser/media/webrtc_log_uploader.cc ('k') | chrome/browser/media/webrtc_log_util.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 <string> 5 #include <string>
6 6
7 #include "base/file_util.h"
8 #include "base/files/file.h" 7 #include "base/files/file.h"
9 #include "base/files/file_path.h" 8 #include "base/files/file_path.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/logging.h" 11 #include "base/logging.h"
12 #include "base/strings/string_number_conversions.h" 12 #include "base/strings/string_number_conversions.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "base/time/time.h" 14 #include "base/time/time.h"
15 #include "chrome/browser/media/webrtc_log_uploader.h" 15 #include "chrome/browser/media/webrtc_log_uploader.h"
16 #include "testing/gtest/include/gtest/gtest.h" 16 #include "testing/gtest/include/gtest/gtest.h"
17 17
18 const char kTestTime[] = "time"; 18 const char kTestTime[] = "time";
19 const char kTestReportId[] = "report-id"; 19 const char kTestReportId[] = "report-id";
(...skipping 238 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 log.Pass(), 258 log.Pass(),
259 log_length, 259 log_length,
260 std::map<std::string, std::string>(), 260 std::map<std::string, std::string>(),
261 upload_done_data); 261 upload_done_data);
262 262
263 VerifyRtpDumpInMultipart(post_data, "rtpdump_recv", incoming_dump_content); 263 VerifyRtpDumpInMultipart(post_data, "rtpdump_recv", incoming_dump_content);
264 VerifyRtpDumpInMultipart(post_data, "rtpdump_send", outgoing_dump_content); 264 VerifyRtpDumpInMultipart(post_data, "rtpdump_send", outgoing_dump_content);
265 265
266 webrtc_log_uploader->StartShutdown(); 266 webrtc_log_uploader->StartShutdown();
267 } 267 }
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc_log_uploader.cc ('k') | chrome/browser/media/webrtc_log_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698