chrome/browser/chrome_browser_main.cc - Issue 1309843005: Remove more //chrome dependencies from VariationsService

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/chrome_browser_main.cc

Issue 1309843005: Remove more //chrome dependencies from VariationsService (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@variations_service_get_channel

Patch Set: Response to review Created 5 years, 4 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

Index: chrome/browser/chrome_browser_main.cc

diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc

index 51500ea5eb9abec4995a26b2f513233dc09c4766..f6c92fb204d11b325f2adb6c9708429ac33634d0 100644

--- a/chrome/browser/chrome_browser_main.cc

+++ b/chrome/browser/chrome_browser_main.cc

@@ -126,6 +126,7 @@

#include "components/variations/net/variations_http_header_provider.h"

#include "components/variations/pref_names.h"

#include "components/variations/variations_associated_data.h"

+#include "components/variations/variations_switches.h"

#include "components/version_info/version_info.h"

#include "content/public/browser/browser_thread.h"

#include "content/public/browser/notification_observer.h"

@@ -662,7 +663,8 @@ void ChromeBrowserMainParts::SetupMetricsAndFieldTrials() {

#if defined(FIELDTRIAL_TESTING_ENABLED)

if (!command_line->HasSwitch(switches::kDisableFieldTrialTestingConfig) &&

!command_line->HasSwitch(switches::kForceFieldTrials) &&

- !command_line->HasSwitch(switches::kVariationsServerURL))

+ !command_line->HasSwitch(

+ chrome_variations::switches::kVariationsServerURL))

chrome_variations::AssociateDefaultFieldTrialConfig();

#endif // defined(FIELDTRIAL_TESTING_ENABLED)

« no previous file with comments | « no previous file | chrome/browser/metrics/metrics_services_manager.cc » ('j') | no next file with comments »