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

Unified Diff: chrome/test/base/testing_browser_process.cc

Issue 271853004: Merge NetworkTimeNotifier to NetworkTimeTracker (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 7 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_io_thread_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index 390d9ef21ea44de4fef69d572f899fadd9fd1908..0755d9f1f34ab44abf2abc82fd5d501f5487cb5c 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -6,12 +6,14 @@
#include "base/prefs/pref_service.h"
#include "base/strings/string_util.h"
+#include "base/time/default_tick_clock.h"
#include "build/build_config.h"
#include "chrome/browser/apps/chrome_apps_client.h"
#include "chrome/browser/background/background_mode_manager.h"
#include "chrome/browser/browser_process.h"
#include "chrome/browser/browser_process_impl.h"
#include "chrome/browser/extensions/chrome_extensions_browser_client.h"
+#include "chrome/browser/network_time/network_time_tracker.h"
#include "chrome/browser/printing/print_job_manager.h"
#include "chrome/browser/profiles/profile_manager.h"
#include "chrome/test/base/testing_browser_process_platform_part.h"
@@ -66,6 +68,8 @@ TestingBrowserProcess::TestingBrowserProcess()
: notification_service_(content::NotificationService::Create()),
module_ref_count_(0),
app_locale_("en"),
+ network_time_tracker_(new NetworkTimeTracker(
+ scoped_ptr<base::TickClock>(new base::DefaultTickClock))),
local_state_(NULL),
io_thread_(NULL),
system_request_context_(NULL),
@@ -360,6 +364,10 @@ WebRtcLogUploader* TestingBrowserProcess::webrtc_log_uploader() {
}
#endif
+NetworkTimeTracker* TestingBrowserProcess::network_time_tracker() {
+ return network_time_tracker_.get();
+}
+
void TestingBrowserProcess::SetSystemRequestContext(
net::URLRequestContextGetter* context_getter) {
system_request_context_ = context_getter;
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_io_thread_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698