[Variations] Renaming ChromeVariations to ClientVariations.

components/variations/variations_http_header_provider.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 <vector>
 
 #include "base/base64.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "components/google/core/browser/google_util.h"
-#include "components/variations/proto/chrome_experiments.pb.h"
+#include "components/variations/proto/client_variations.pb.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/http/http_request_headers.h"
 #include "url/gurl.h"
 
 // TODO(mathp): Once the move to variations namespace is complete, remove these.
 using chrome_variations::EMPTY_ID;
 using chrome_variations::GOOGLE_WEB_PROPERTIES;
 using chrome_variations::GOOGLE_WEB_PROPERTIES_TRIGGER;
 using chrome_variations::VariationID;
 
@@ skipping 19 matching lines @@
 
 VariationsHttpHeaderProvider* VariationsHttpHeaderProvider::GetInstance() {
   return Singleton<VariationsHttpHeaderProvider>::get();
 }
 
 void VariationsHttpHeaderProvider::AppendHeaders(
     const GURL& url,
     bool incognito,
     bool uma_enabled,
     net::HttpRequestHeaders* headers) {
-  // Note the criteria for attaching Chrome experiment headers:
+  // Note the criteria for attaching client experiment headers:
   // 1. We only transmit to Google owned domains which can evaluate experiments.
   //    1a. These include hosts which have a standard postfix such as:
   //         *.doubleclick.net or *.googlesyndication.com or
   //         exactly www.googleadservices.com or
   //         international TLD domains *.google.<TLD> or *.youtube.<TLD>.
   // 2. Only transmit for non-Incognito profiles.
   // 3. For the X-Chrome-UMA-Enabled bit, only set it if UMA is in fact enabled
   //    for this install of Chrome.
   // 4. For the X-Client-Data header, only include non-empty variation IDs.
   if (incognito || !ShouldAppendHeaders(url))
@@ skipping 137 matching lines @@
   DCHECK_LE(total_id_count, 10U);
   if (total_id_count > 20)
     return;
 
   // Merge the two sets of experiment ids.
   std::set<VariationID> all_variation_ids_set = default_variation_ids_set_;
   for (std::set<VariationID>::const_iterator it = variation_ids_set_.begin();
        it != variation_ids_set_.end(); ++it) {
     all_variation_ids_set.insert(*it);
   }
-  metrics::ChromeVariations proto;
+  variations::ClientVariations proto;

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

Nit: No need for namespace decl here.

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

Done.

   for (std::set<VariationID>::const_iterator it = all_variation_ids_set.begin();
        it != all_variation_ids_set.end(); ++it) {
     proto.add_variation_id(*it);
   }
 
   std::set<VariationID> all_trigger_ids_set = default_trigger_id_set_;
   for (std::set<VariationID>::const_iterator it =
            variation_trigger_ids_set_.begin();
        it != variation_trigger_ids_set_.end(); ++it) {
     all_trigger_ids_set.insert(*it);
@@ skipping 31 matching lines @@
   for (size_t i = 0; i < arraysize(kSuffixesToSetHeadersFor); ++i) {
     if (EndsWith(host, kSuffixesToSetHeadersFor[i], false))
       return true;
   }
 
   return google_util::IsYoutubeDomainUrl(url, google_util::ALLOW_SUBDOMAIN,
                                          google_util::ALLOW_NON_STANDARD_PORTS);
 }
 
 }  // namespace variations