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

Unified Diff: chrome/browser/io_thread.cc

Issue 1421983002: Include tab IDs when reporting data use accounting. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@data_use_scoped_vector
Patch Set: Fixed external_data_use_observer test Created 5 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/data_usage/tab_id_provider_unittest.cc ('k') | chrome/browser/net/chrome_network_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/io_thread.cc
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 2301ab5ab5965f00311c4b15320e022f4d42f313..ec1f91ea53b194c38c7fba023763b418ef0660fb 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -30,6 +30,7 @@
#include "base/trace_event/trace_event.h"
#include "build/build_config.h"
#include "chrome/browser/browser_process.h"
+#include "chrome/browser/data_usage/tab_id_annotator.h"
#include "chrome/browser/net/async_dns_field_trial.h"
#include "chrome/browser/net/chrome_network_delegate.h"
#include "chrome/browser/net/connect_interceptor.h"
@@ -605,7 +606,9 @@ void IOThread::Init() {
extension_event_router_forwarder_;
#endif
- data_use_aggregator_.reset(new data_usage::DataUseAggregator());
+ data_use_aggregator_.reset(new data_usage::DataUseAggregator(
+ scoped_ptr<data_usage::DataUseAnnotator>(
+ new chrome_browser_data_usage::TabIdAnnotator())));
// TODO(erikchen): Remove ScopedTracker below once http://crbug.com/466432
// is fixed.
« no previous file with comments | « chrome/browser/data_usage/tab_id_provider_unittest.cc ('k') | chrome/browser/net/chrome_network_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698