Index: chrome/browser/extensions/component_loader.cc |
diff --git a/chrome/browser/extensions/component_loader.cc b/chrome/browser/extensions/component_loader.cc |
index d8f0a840910c72136c9483a6f10c6a1557c3ab81..240ce7fe5fa4336bdd6fc4abebd889193830795d 100644 |
--- a/chrome/browser/extensions/component_loader.cc |
+++ b/chrome/browser/extensions/component_loader.cc |
@@ -516,10 +516,12 @@ void ComponentLoader::AddDefaultComponentExtensionsWithBackgroundPages( |
std::string field_trial_result = |
base::FieldTrialList::FindFullName(kFieldTrialName); |
Alexei Svitkine (slow)
2013/11/01 15:16:37
It seems this logic is also duplicated in geolocat
vadimt
2013/11/01 17:48:19
In geolocation, the code is pretty dead, and that
|
- bool enabled_via_field_trial = field_trial_result.compare( |
- 0, |
- enable_prefix.length(), |
- enable_prefix) == 0; |
+ bool enabled_via_field_trial = |
+ field_trial_result.empty() || |
Alexei Svitkine (slow)
2013/11/01 15:16:37
Not convinced this is a good solution - for exampl
vadimt
2013/11/01 17:48:19
Done. I chose the second approach, since this is t
|
+ field_trial_result.compare( |
+ 0, |
+ enable_prefix.length(), |
+ enable_prefix) == 0; |
bool enabled_via_flag = |
chrome::VersionInfo::GetChannel() != |