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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/installer/gcapi/gcapi_omaha_experiment_test.cc

Issue 1291763002: Componentize kExperimentLabelSeparator & BuildExperimentDateString. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove "#if defined(OS_WIN)" from google_update_constants.cc 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
« no previous file with comments | « chrome/installer/gcapi/gcapi_omaha_experiment.cc ('k') | chrome/installer/gcapi/gcapi_reactivation_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/installer/gcapi/gcapi_omaha_experiment_test.cc
diff --git a/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc b/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc
index 43b7bcaeb72f97c2526a22360d3fc365e66db7b3..f69031e11083f7776043068d85b7828ab0b5c916 100644
--- a/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc
+++ b/chrome/installer/gcapi/gcapi_omaha_experiment_test.cc
@@ -8,8 +8,8 @@
#include "chrome/installer/gcapi/gcapi.h"
#include "chrome/installer/gcapi/gcapi_test_registry_overrider.h"
#include "chrome/installer/util/google_update_constants.h"
-#include "chrome/installer/util/google_update_experiment_util.h"
#include "chrome/installer/util/google_update_settings.h"
+#include "components/variations/variations_experiment_util.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::ASCIIToUTF16;
@@ -66,7 +66,7 @@ TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
base::string16 expected_labels(kSomeExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(reactivation_label_);
VerifyExperimentLabels(expected_labels);
}
@@ -74,18 +74,18 @@ TEST_F(GCAPIOmahaExperimentTest, SetReactivationLabelWithExistingExperiments) {
TEST_F(GCAPIOmahaExperimentTest,
SetReactivationLabelWithExistingIdenticalExperiment) {
base::string16 previous_labels(kSomeExperiments);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(reactivation_label_);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(kSomeOtherExperiments);
GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
base::string16 expected_labels(kSomeExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(kSomeOtherExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(reactivation_label_);
VerifyExperimentLabels(expected_labels);
}
@@ -93,14 +93,14 @@ TEST_F(GCAPIOmahaExperimentTest,
TEST_F(GCAPIOmahaExperimentTest,
SetReactivationLabelWithExistingIdenticalAtBeginning) {
base::string16 previous_labels(reactivation_label_);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(kSomeExperiments);
GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
base::string16 expected_labels(kSomeExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(reactivation_label_);
VerifyExperimentLabels(expected_labels);
}
@@ -108,30 +108,30 @@ TEST_F(GCAPIOmahaExperimentTest,
TEST_F(GCAPIOmahaExperimentTest,
SetReactivationLabelWithFakeMatchInAnExperiment) {
base::string16 previous_labels(kSomeExperiments);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(L"blah_");
// Shouldn't match deletion criteria.
previous_labels.append(reactivation_label_);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(kSomeOtherExperiments);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
// Should match the deletion criteria.
previous_labels.append(reactivation_label_);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(kSomeMoreExperiments);
GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
base::string16 expected_labels(kSomeExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(L"blah_");
expected_labels.append(reactivation_label_);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(kSomeOtherExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(kSomeMoreExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(reactivation_label_);
VerifyExperimentLabels(expected_labels);
}
@@ -139,23 +139,23 @@ TEST_F(GCAPIOmahaExperimentTest,
TEST_F(GCAPIOmahaExperimentTest,
SetReactivationLabelWithFakeMatchInAnExperimentAndNoRealMatch) {
base::string16 previous_labels(kSomeExperiments);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(L"blah_");
// Shouldn't match deletion criteria.
previous_labels.append(reactivation_label_);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
previous_labels.append(kSomeOtherExperiments);
GoogleUpdateSettings::SetExperimentLabels(false, previous_labels);
ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
base::string16 expected_labels(kSomeExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(L"blah_");
expected_labels.append(reactivation_label_);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(kSomeOtherExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(reactivation_label_);
VerifyExperimentLabels(expected_labels);
}
@@ -163,7 +163,7 @@ TEST_F(GCAPIOmahaExperimentTest,
TEST_F(GCAPIOmahaExperimentTest,
SetReactivationLabelWithExistingEntryWithLabelAsPrefix) {
base::string16 previous_labels(kSomeExperiments);
- previous_labels += google_update::kExperimentLabelSeparator;
+ previous_labels += variations::kExperimentLabelSeparator;
// Append prefix matching the label, but not followed by '='.
previous_labels.append(gcapi_internals::kReactivationLabel);
// Shouldn't match deletion criteria.
@@ -173,10 +173,10 @@ TEST_F(GCAPIOmahaExperimentTest,
ASSERT_TRUE(SetReactivationExperimentLabels(kBrand, kUserLevel));
base::string16 expected_labels(kSomeExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(gcapi_internals::kReactivationLabel);
expected_labels.append(kSomeOtherExperiments);
- expected_labels += google_update::kExperimentLabelSeparator;
+ expected_labels += variations::kExperimentLabelSeparator;
expected_labels.append(reactivation_label_);
VerifyExperimentLabels(expected_labels);
}
« no previous file with comments | « chrome/installer/gcapi/gcapi_omaha_experiment.cc ('k') | chrome/installer/gcapi/gcapi_reactivation_test.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698