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

Side by Side Diff: chrome/browser/chromeos/external_metrics.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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/chromeos/external_metrics.h" 5 #include "chrome/browser/chromeos/external_metrics.h"
6 6
7 #include <map> 7 #include <map>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/file_util.h"
12 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/file_util.h"
13 #include "base/metrics/field_trial.h" 13 #include "base/metrics/field_trial.h"
14 #include "base/metrics/histogram.h" 14 #include "base/metrics/histogram.h"
15 #include "base/metrics/sparse_histogram.h" 15 #include "base/metrics/sparse_histogram.h"
16 #include "base/metrics/statistics_recorder.h" 16 #include "base/metrics/statistics_recorder.h"
17 #include "base/timer/elapsed_timer.h" 17 #include "base/timer/elapsed_timer.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/metrics/chromeos_metrics_provider.h" 19 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
20 #include "components/metrics/metrics_service.h" 20 #include "components/metrics/metrics_service.h"
21 #include "components/metrics/serialization/metric_sample.h" 21 #include "components/metrics/serialization/metric_sample.h"
22 #include "components/metrics/serialization/serialization_utils.h" 22 #include "components/metrics/serialization/serialization_utils.h"
(...skipping 230 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 void ExternalMetrics::SetupFieldTrialsOnFileThread() { 253 void ExternalMetrics::SetupFieldTrialsOnFileThread() {
254 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE)); 254 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
255 // Field trials that do not read from files can be initialized in 255 // Field trials that do not read from files can be initialized in
256 // ExternalMetrics::Start() above. 256 // ExternalMetrics::Start() above.
257 SetupProgressiveScanFieldTrial(); 257 SetupProgressiveScanFieldTrial();
258 258
259 ScheduleCollector(); 259 ScheduleCollector();
260 } 260 }
261 261
262 } // namespace chromeos 262 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/extensions/wallpaper_private_api.cc ('k') | chrome/browser/chromeos/external_metrics_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698