Index: chrome/browser/metrics/metrics_state_manager_unittest.cc |
diff --git a/chrome/browser/metrics/metrics_state_manager_unittest.cc b/chrome/browser/metrics/metrics_state_manager_unittest.cc |
index bad4b77a9f4922d32286e0a22c141022c791238d..288d0872b88ed75cfc03d96a514620a1f5d22f1a 100644 |
--- a/chrome/browser/metrics/metrics_state_manager_unittest.cc |
+++ b/chrome/browser/metrics/metrics_state_manager_unittest.cc |
@@ -10,8 +10,9 @@ |
#include "base/command_line.h" |
#include "base/prefs/testing_pref_service.h" |
#include "chrome/common/chrome_switches.h" |
-#include "chrome/common/metrics/caching_permuted_entropy_provider.h" |
#include "chrome/common/pref_names.h" |
+#include "components/variations/caching_permuted_entropy_provider.h" |
+#include "components/variations/pref_names.h" |
#include "testing/gtest/include/gtest/gtest.h" |
namespace metrics { |
@@ -83,8 +84,8 @@ TEST_F(MetricsStateManagerTest, LowEntropySource0NotReset) { |
TEST_F(MetricsStateManagerTest, |
PermutedEntropyCacheClearedWhenLowEntropyReset) { |
const PrefService::Preference* low_entropy_pref = |
- prefs_.FindPreference(prefs::kMetricsLowEntropySource); |
- const char* kCachePrefName = prefs::kMetricsPermutedEntropyCache; |
+ prefs_.FindPreference(::prefs::kMetricsLowEntropySource); |
+ const char* kCachePrefName = prefs::kVariationsPermutedEntropyCache; |
int low_entropy_value = -1; |
// First, generate an initial low entropy source value. |
@@ -109,7 +110,7 @@ TEST_F(MetricsStateManagerTest, |
EXPECT_EQ("test", prefs_.GetString(kCachePrefName)); |
EXPECT_EQ(low_entropy_value, |
- prefs_.GetInteger(prefs::kMetricsLowEntropySource)); |
+ prefs_.GetInteger(::prefs::kMetricsLowEntropySource)); |
} |
// Verify that the cache does get reset if --reset-variations-state is passed. |
@@ -131,7 +132,7 @@ TEST_F(MetricsStateManagerTest, ResetMetricsIDs) { |
// Set an initial client id in prefs. It should not be possible for the |
// metrics state manager to generate this id randomly. |
const std::string kInitialClientId = "initial client id"; |
- prefs_.SetString(prefs::kMetricsClientID, kInitialClientId); |
+ prefs_.SetString(::prefs::kMetricsClientID, kInitialClientId); |
// Make sure the initial client id isn't reset by the metrics state manager. |
{ |
@@ -141,7 +142,7 @@ TEST_F(MetricsStateManagerTest, ResetMetricsIDs) { |
} |
// Set the reset pref to cause the IDs to be reset. |
- prefs_.SetBoolean(prefs::kMetricsResetIds, true); |
+ prefs_.SetBoolean(::prefs::kMetricsResetIds, true); |
// Cause the actual reset to happen. |
{ |
@@ -151,10 +152,10 @@ TEST_F(MetricsStateManagerTest, ResetMetricsIDs) { |
state_manager->GetLowEntropySource(); |
- EXPECT_FALSE(prefs_.GetBoolean(prefs::kMetricsResetIds)); |
+ EXPECT_FALSE(prefs_.GetBoolean(::prefs::kMetricsResetIds)); |
} |
- EXPECT_NE(kInitialClientId, prefs_.GetString(prefs::kMetricsClientID)); |
+ EXPECT_NE(kInitialClientId, prefs_.GetString(::prefs::kMetricsClientID)); |
} |
} // namespace metrics |