Put VariationsService into the chrome_variations namespace.

Also, rename chrome_variations::ID to chrome_variations::VariationID,
since there are other things in that namespace now (which was already
the case with the protobuf classes).

BUG=none
TEST=compiles

Review URL: https://chromiumcodereview.appspot.com/10693106

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@145608 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 4 insertions, 4 deletions

diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
index f3905b1..8be42ed 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -385,7 +385,7 @@ void ChromeResourceDispatcherHostDelegate::OnFieldTrialGroupFinalized(
     const std::string& trial_name,
     const std::string& group_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  chrome_variations::ID new_id =
+  chrome_variations::VariationID new_id =
       experiments_helper::GetGoogleVariationID(trial_name, group_name);
   if (new_id == chrome_variations::kEmptyID)
     return;
@@ -406,7 +406,7 @@ void ChromeResourceDispatcherHostDelegate::InitVariationIDsCacheIfNeeded() {
   base::FieldTrialList::GetFieldTrialSelectedGroups(&initial_groups);
   for (base::FieldTrial::SelectedGroups::const_iterator it =
        initial_groups.begin(); it != initial_groups.end(); ++it) {
-    chrome_variations::ID id =
+    chrome_variations::VariationID id =
         experiments_helper::GetGoogleVariationID(it->trial, it->group);
     if (id != chrome_variations::kEmptyID)
       variation_ids_set_.insert(id);
@@ -422,7 +422,7 @@ void ChromeResourceDispatcherHostDelegate::UpdateVariationIDsHeaderValue() {
   if (variation_ids_set_.empty())
     return;
   metrics::ChromeVariations proto;
-  for (std::set<chrome_variations::ID>::const_iterator it =
+  for (std::set<chrome_variations::VariationID>::const_iterator it =
       variation_ids_set_.begin(); it != variation_ids_set_.end(); ++it)
     proto.add_variation_id(*it);
 
diff --git a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
index ef3a8b8..0e89b80 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
@@ -128,7 +128,7 @@ class ChromeResourceDispatcherHostDelegate
   // This consists of a list of valid IDs, and the actual transmitted header.
   // Note that since this cache is both initialized and accessed from the IO
   // thread, we do not need to synchronize its uses.
-  std::set<chrome_variations::ID> variation_ids_set_;
+  std::set<chrome_variations::VariationID> variation_ids_set_;
   std::string variation_ids_header_;
 
   DISALLOW_COPY_AND_ASSIGN(ChromeResourceDispatcherHostDelegate);