[Variations] Renaming ChromeVariations to ClientVariations.

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/chrome_experiments.pb.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;

[Alexei Svitkine (slow), 2014/07/14 19:43:20]

Nit: Put return on next line.

[Mathieu, 2014/07/14 19:50:16]

Done.

-  metrics::ChromeVariations proto;
+  variations::ClientVariations proto;

[Alexei Svitkine (slow), 2014/07/14 19:43:21]

Nit: No need for namespace here.

[Mathieu, 2014/07/14 19:50:16]

Done.

   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,
@@ skipping 189 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