Revert 285657 "Move variations component code to variations name..."

trunk/src/components/variations/variations_associated_data.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/variations/variations_associated_data.h"
 
 #include <map>
 #include <utility>
 #include <vector>
 
 #include "base/memory/singleton.h"
 
-namespace variations {
+namespace chrome_variations {
+
+// TODO(asvitkine): Delete these when this file moves to variations namespace.
+using variations::ActiveGroupId;
+using variations::ActiveGroupIdCompare;
+using variations::MakeActiveGroupId;
 
 namespace {
 
 // The internal singleton accessor for the map, used to keep it thread-safe.
 class GroupMapAccessor {
  public:
   typedef std::map<ActiveGroupId, VariationID, ActiveGroupIdCompare>
       GroupToIDMap;
 
   // Retrieve the singleton.
@@ skipping 203 matching lines @@
 void ClearAllVariationIDs() {
   GroupMapAccessor::GetInstance()->ClearAllMapsForTesting();
 }
 
 void ClearAllVariationParams() {
   VariationsParamAssociator::GetInstance()->ClearAllParamsForTesting();
 }
 
 }  // namespace testing
 
-}  // namespace variations
+}  // namespace chrome_variations