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

Side by Side Diff: chrome/browser/media/webrtc_rtp_dump_handler.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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 "chrome/browser/media/webrtc_rtp_dump_handler.h" 5 #include "chrome/browser/media/webrtc_rtp_dump_handler.h"
6 6
7 #include "base/file_util.h" 7 #include "base/files/file_util.h"
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/time/time.h" 10 #include "base/time/time.h"
11 #include "chrome/browser/media/webrtc_rtp_dump_writer.h" 11 #include "chrome/browser/media/webrtc_rtp_dump_writer.h"
12 #include "content/public/browser/browser_thread.h" 12 #include "content/public/browser/browser_thread.h"
13 13
14 using content::BrowserThread; 14 using content::BrowserThread;
15 15
16 namespace { 16 namespace {
17 17
(...skipping 316 matching lines...) Expand 10 before | Expand all | Expand 10 after
334 if (incoming_state_ != STATE_STOPPING && outgoing_state_ != STATE_STOPPING && 334 if (incoming_state_ != STATE_STOPPING && outgoing_state_ != STATE_STOPPING &&
335 incoming_state_ != STATE_STARTED && outgoing_state_ != STATE_STARTED) { 335 incoming_state_ != STATE_STARTED && outgoing_state_ != STATE_STARTED) {
336 dump_writer_.reset(); 336 dump_writer_.reset();
337 --g_ongoing_rtp_dumps; 337 --g_ongoing_rtp_dumps;
338 } 338 }
339 339
340 // This object might be deleted after running the callback. 340 // This object might be deleted after running the callback.
341 if (!callback.is_null()) 341 if (!callback.is_null())
342 callback.Run(); 342 callback.Run();
343 } 343 }
OLDNEW
« no previous file with comments | « chrome/browser/media/webrtc_logging_handler_host.cc ('k') | chrome/browser/media/webrtc_rtp_dump_handler_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698