Move variations component code to variations namespace.

components/variations/variations_http_header_provider_unittest.cc

 // Copyright 2014 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_http_header_provider.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "components/variations/entropy_provider.h"
 #include "components/variations/proto/client_variations.pb.h"
 #include "components/variations/variations_associated_data.h"
 #include "net/http/http_request_headers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "url/gurl.h"
 
-// TODO(mathp): Remove once everything is under namespace 'variations'.
-using chrome_variations::GOOGLE_WEB_PROPERTIES;
-using chrome_variations::GOOGLE_WEB_PROPERTIES_TRIGGER;
-using chrome_variations::IDCollectionKey;
-using chrome_variations::VariationID;
-
 namespace variations {
 
 namespace {
 
 // Decodes the variations header and extracts the variation ids.
 bool ExtractVariationIds(const std::string& variations,
                          std::set<VariationID>* variation_ids,
                          std::set<VariationID>* trigger_ids) {
   std::string serialized_proto;
   if (!base::Base64Decode(variations, &serialized_proto))
     return false;
   ClientVariations proto;
   if (!proto.ParseFromString(serialized_proto)) return false;
   for (int i = 0; i < proto.variation_id_size(); ++i)
     variation_ids->insert(proto.variation_id(i));
   for (int i = 0; i < proto.trigger_variation_id_size(); ++i)
     trigger_ids->insert(proto.trigger_variation_id(i));
   return true;
 }
 
 scoped_refptr<base::FieldTrial> CreateTrialAndAssociateId(
-    const std::string& trial_name, const std::string& default_group_name,
-    IDCollectionKey key, VariationID id) {
+    const std::string& trial_name,
+    const std::string& default_group_name,
+    IDCollectionKey key,
+    VariationID id) {
   scoped_refptr<base::FieldTrial> trial(
       base::FieldTrialList::CreateFieldTrial(trial_name, default_group_name));
 
-  chrome_variations::AssociateGoogleVariationID(key, trial->trial_name(),
-                                                trial->group_name(), id);
+  AssociateGoogleVariationID(key, trial->trial_name(), trial->group_name(), id);
 
   return trial;
 }
 
 }  // namespace
 
 class VariationsHttpHeaderProviderTest : public ::testing::Test {
  public:
   VariationsHttpHeaderProviderTest() {}
 
   virtual ~VariationsHttpHeaderProviderTest() {}
 
   virtual void TearDown() OVERRIDE {
-    chrome_variations::testing::ClearAllVariationIDs();
+    testing::ClearAllVariationIDs();
   }
 };
 
 TEST_F(VariationsHttpHeaderProviderTest, ShouldAppendHeaders) {
   struct {
     const char* url;
     bool should_append_headers;
   } cases[] = {
         {"http://google.com", true},
         {"http://www.google.com", true},
@@ skipping 71 matching lines @@
         {"http://a.b.doubleclick.net", true},
         {"http://a.b.ggpht.com", true},
         {"http://a.b.googleadservices.com", true},
         {"http://a.b.googleapis.com", true},
         {"http://a.b.googlesyndication.com", true},
         {"http://a.b.googleusercontent.com", true},
         {"http://a.b.googlevideo.com", true},
         {"http://ssl.gstatic.com", true},
         {"http://a.b.gstatic.com", true},
         {"http://a.b.ytimg.com", true},
-
     };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); ++i) {
     const GURL url(cases[i].url);
     EXPECT_EQ(cases[i].should_append_headers,
               VariationsHttpHeaderProvider::ShouldAppendHeaders(url))
         << url;
   }
 }
 
@@ skipping 67 matching lines @@
   headers.GetHeader("X-Client-Data", &variations);
 
   std::set<VariationID> variation_ids;
   std::set<VariationID> trigger_ids;
   ASSERT_TRUE(ExtractVariationIds(variations, &variation_ids, &trigger_ids));
   EXPECT_TRUE(variation_ids.find(123) != variation_ids.end());
   EXPECT_TRUE(trigger_ids.find(456) != trigger_ids.end());
 }
 
 }  // namespace variations