Move Variations stuff into variations/ directories and add OWNERS files for the variations client team.

BUG=None
TEST=No user visible changes.
Review URL: https://chromiumcodereview.appspot.com/10828314

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

24 files changed, 40 insertions, 36 deletions

diff --git a/chrome/browser/autocomplete/autocomplete_field_trial.cc b/chrome/browser/autocomplete/autocomplete_field_trial.cc
index a5db087..9c55f3d0 100644
--- a/chrome/browser/autocomplete/autocomplete_field_trial.cc
+++ b/chrome/browser/autocomplete/autocomplete_field_trial.cc
@@ -8,8 +8,8 @@
 
 #include "base/metrics/field_trial.h"
 #include "base/string_number_conversions.h"
-#include "chrome/common/metrics/variations_util.h"
-#include "chrome/common/metrics/variation_ids.h"
+#include "chrome/common/metrics/variations/variation_ids.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 
 namespace {
 
diff --git a/chrome/browser/browser_process_impl.cc b/chrome/browser/browser_process_impl.cc
index 769f07b..a2a03ee 100644
--- a/chrome/browser/browser_process_impl.cc
+++ b/chrome/browser/browser_process_impl.cc
@@ -37,7 +37,7 @@
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/thread_watcher.h"
-#include "chrome/browser/metrics/variations_service.h"
+#include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/net/crl_set_fetcher.h"
 #include "chrome/browser/net/sdch_dictionary_fetcher.h"
diff --git a/chrome/browser/chrome_browser_field_trials.cc b/chrome/browser/chrome_browser_field_trials.cc
index 0c2de7a..f1e27a8 100644
--- a/chrome/browser/chrome_browser_field_trials.cc
+++ b/chrome/browser/chrome_browser_field_trials.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/prerender/prerender_field_trial.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/chrome_version_info.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "net/http/http_network_layer.h"
 #include "net/http/http_stream_factory.h"
 #include "net/socket/client_socket_pool_base.h"
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index 05ef7c7..bd6cf1f 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -50,7 +50,7 @@
 #include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/metrics/thread_watcher.h"
 #include "chrome/browser/metrics/tracking_synchronizer.h"
-#include "chrome/browser/metrics/variations_service.h"
+#include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/browser/net/chrome_net_log.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
@@ -92,7 +92,7 @@
 #include "chrome/common/json_pref_store.h"
 #include "chrome/common/jstemplate_builder.h"
 #include "chrome/common/logging_chrome.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/profiling.h"
diff --git a/chrome/browser/metrics/field_trial_synchronizer.cc b/chrome/browser/metrics/field_trial_synchronizer.cc
index 1d8cea5..5999922 100644
--- a/chrome/browser/metrics/field_trial_synchronizer.cc
+++ b/chrome/browser/metrics/field_trial_synchronizer.cc
@@ -8,7 +8,7 @@
 #include "base/logging.h"
 #include "base/threading/thread.h"
 #include "chrome/common/chrome_constants.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
diff --git a/chrome/browser/metrics/metrics_log.cc b/chrome/browser/metrics/metrics_log.cc
index 7eba4ce..58f7b22e 100644
--- a/chrome/browser/metrics/metrics_log.cc
+++ b/chrome/browser/metrics/metrics_log.cc
@@ -34,7 +34,7 @@
 #include "chrome/common/metrics/proto/omnibox_event.pb.h"
 #include "chrome/common/metrics/proto/profiler_event.pb.h"
 #include "chrome/common/metrics/proto/system_profile.pb.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/browser/content_browser_client.h"
diff --git a/chrome/browser/metrics/metrics_log_unittest.cc b/chrome/browser/metrics/metrics_log_unittest.cc
index 0424b13..8f97071 100644
--- a/chrome/browser/metrics/metrics_log_unittest.cc
+++ b/chrome/browser/metrics/metrics_log_unittest.cc
@@ -13,7 +13,7 @@
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/metrics/proto/profiler_event.pb.h"
 #include "chrome/common/metrics/proto/system_profile.pb.h"
 #include "chrome/common/pref_names.h"
diff --git a/chrome/browser/metrics/variations/OWNERS b/chrome/browser/metrics/variations/OWNERS
new file mode 100644
index 0000000..9e09a4b
--- /dev/null
+++ b/chrome/browser/metrics/variations/OWNERS
@@ -0,0 +1,2 @@
+asvitkine@chromium.org
+stevet@chromium.org
diff --git a/chrome/browser/metrics/variations_service.cc b/chrome/browser/metrics/variations/variations_service.cc
index 1d03451..6c6f4b7 100644
--- a/chrome/browser/metrics/variations_service.cc
+++ b/chrome/browser/metrics/variations/variations_service.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/metrics/variations_service.h"
+#include "chrome/browser/metrics/variations/variations_service.h"
 
 #include <set>
 
@@ -17,7 +17,7 @@
 #include "chrome/browser/metrics/proto/trials_seed.pb.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/common/url_fetcher.h"
diff --git a/chrome/browser/metrics/variations_service.h b/chrome/browser/metrics/variations/variations_service.h
index 54f65e3..7430768 100644
--- a/chrome/browser/metrics/variations_service.h
+++ b/chrome/browser/metrics/variations/variations_service.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_METRICS_VARIATIONS_SERVICE_H_
-#define CHROME_BROWSER_METRICS_VARIATIONS_SERVICE_H_
+#ifndef CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_
+#define CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_
 
 #include <string>
 
@@ -143,4 +143,4 @@ class VariationsService : public net::URLFetcherDelegate {
 
 }  // namespace chrome_variations
 
-#endif  // CHROME_BROWSER_METRICS_VARIATIONS_SERVICE_H_
+#endif  // CHROME_BROWSER_METRICS_VARIATIONS_VARIATIONS_SERVICE_H_
diff --git a/chrome/browser/metrics/variations_service_unittest.cc b/chrome/browser/metrics/variations/variations_service_unittest.cc
index 527348d..4971552 100644
--- a/chrome/browser/metrics/variations_service_unittest.cc
+++ b/chrome/browser/metrics/variations/variations_service_unittest.cc
@@ -5,7 +5,7 @@
 #include "base/base64.h"
 #include "base/string_split.h"
 #include "chrome/browser/metrics/proto/study.pb.h"
-#include "chrome/browser/metrics/variations_service.h"
+#include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
diff --git a/chrome/browser/prefs/browser_prefs.cc b/chrome/browser/prefs/browser_prefs.cc
index 12dd6a0..d509ec9 100644
--- a/chrome/browser/prefs/browser_prefs.cc
+++ b/chrome/browser/prefs/browser_prefs.cc
@@ -30,7 +30,7 @@
 #include "chrome/browser/managed_mode.h"
 #include "chrome/browser/metrics/metrics_log.h"
 #include "chrome/browser/metrics/metrics_service.h"
-#include "chrome/browser/metrics/variations_service.h"
+#include "chrome/browser/metrics/variations/variations_service.h"
 #include "chrome/browser/net/http_server_properties_manager.h"
 #include "chrome/browser/net/net_pref_observer.h"
 #include "chrome/browser/net/predictor.h"
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 b90879b..e0bb4e5 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc
@@ -29,7 +29,7 @@
 #include "chrome/browser/ui/sync/one_click_signin_helper.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/extensions/user_script.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/metrics/proto/chrome_experiments.pb.h"
 #include "chrome/common/render_messages.h"
 #include "content/public/browser/browser_thread.h"
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 9857ffe..5e63f0d 100644
--- a/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
+++ b/chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h
@@ -10,7 +10,7 @@
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/metrics/field_trial.h"
-#include "chrome/common/metrics/variation_ids.h"
+#include "chrome/common/metrics/variations/variation_ids.h"
 #include "content/public/browser/resource_dispatcher_host_delegate.h"
 
 class DelayedResourceQueue;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0d0ec7c..7e8de23 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1476,8 +1476,8 @@
         'browser/metrics/tracking_synchronizer.cc',
         'browser/metrics/tracking_synchronizer.h',
         'browser/metrics/tracking_synchronizer_observer.h',
-        'browser/metrics/variations_service.cc',
-        'browser/metrics/variations_service.h',
+        'browser/metrics/variations/variations_service.cc',
+        'browser/metrics/variations/variations_service.h',
         'browser/native_window_notification_source.h',
         'browser/net/cache_stats.cc',
         'browser/net/cache_stats.h',
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index 2075d1f..9a2bb2b 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -230,8 +230,8 @@
         'common/metrics/metrics_log_manager.h',
         'common/metrics/metrics_service_base.cc',
         'common/metrics/metrics_service_base.h',
-        'common/metrics/variations_util.cc',
-        'common/metrics/variations_util.h',
+        'common/metrics/variations/variations_util.cc',
+        'common/metrics/variations/variations_util.h',
         'common/multi_process_lock.h',
         'common/multi_process_lock_linux.cc',
         'common/multi_process_lock_mac.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 2467d6d..d2f220a 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1367,7 +1367,7 @@
         'browser/metrics/metrics_log_serializer_unittest.cc',
         'browser/metrics/metrics_service_unittest.cc',
         'browser/metrics/thread_watcher_unittest.cc',
-        'browser/metrics/variations_service_unittest.cc',
+        'browser/metrics/variations/variations_service_unittest.cc',
         'browser/nacl_host/nacl_validation_cache_unittest.cc',
         'browser/nacl_host/pnacl_file_host_unittest.cc',
         'browser/net/chrome_fraudulent_certificate_reporter_unittest.cc',
@@ -1982,7 +1982,7 @@
         'common/mac/objc_zombie_unittest.mm',
         'common/metrics/metrics_log_base_unittest.cc',
         'common/metrics/metrics_log_manager_unittest.cc',
-        'common/metrics/variations_util_unittest.cc',
+        'common/metrics/variations/variations_util_unittest.cc',
         'common/multi_process_lock_unittest.cc',
         'common/net/url_util_unittest.cc',
         'common/net/gaia/gaia_auth_fetcher_unittest.cc',
diff --git a/chrome/common/child_process_logging_mac.mm b/chrome/common/child_process_logging_mac.mm
index b54d7c7..a4f4666 100644
--- a/chrome/common/child_process_logging_mac.mm
+++ b/chrome/common/child_process_logging_mac.mm
@@ -13,7 +13,7 @@
 #include "base/stringprintf.h"
 #include "base/sys_string_conversions.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "content/public/common/gpu_info.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/common/metrics/variations/OWNERS b/chrome/common/metrics/variations/OWNERS
new file mode 100644
index 0000000..9e09a4b
--- /dev/null
+++ b/chrome/common/metrics/variations/OWNERS
@@ -0,0 +1,2 @@
+asvitkine@chromium.org
+stevet@chromium.org
diff --git a/chrome/common/metrics/variation_ids.h b/chrome/common/metrics/variations/variation_ids.h
index 90a1bbf..7baabb1 100644
--- a/chrome/common/metrics/variation_ids.h
+++ b/chrome/common/metrics/variations/variation_ids.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_METRICS_VARIATION_IDS_H_
-#define CHROME_COMMON_METRICS_VARIATION_IDS_H_
+#ifndef CHROME_COMMON_METRICS_VARIATIONS_VARIATION_IDS_H_
+#define CHROME_COMMON_METRICS_VARIATIONS_VARIATION_IDS_H_
 
 namespace chrome_variations {
 
@@ -119,4 +119,4 @@ enum VariationID {
 
 }  // namespace chrome_variations
 
-#endif  // CHROME_COMMON_METRICS_VARIATION_IDS_H_
+#endif  // CHROME_COMMON_METRICS_VARIATIONS_VARIATION_IDS_H_
diff --git a/chrome/common/metrics/variations_util.cc b/chrome/common/metrics/variations/variations_util.cc
index 86d786f..5d09145 100644
--- a/chrome/common/metrics/variations_util.cc
+++ b/chrome/common/metrics/variations/variations_util.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 
 #include <map>
 #include <vector>
@@ -14,7 +14,7 @@
 #include "base/sys_byteorder.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/child_process_logging.h"
-#include "chrome/common/metrics/variation_ids.h"
+#include "chrome/common/metrics/variations/variation_ids.h"
 
 namespace {
 
diff --git a/chrome/common/metrics/variations_util.h b/chrome/common/metrics/variations/variations_util.h
index 5c72397..5699b60 100644
--- a/chrome/common/metrics/variations_util.h
+++ b/chrome/common/metrics/variations/variations_util.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_COMMON_METRICS_VARIATIONS_UTIL_H_
-#define CHROME_COMMON_METRICS_VARIATIONS_UTIL_H_
+#ifndef CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
+#define CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/metrics/field_trial.h"
 #include "base/string16.h"
-#include "chrome/common/metrics/variation_ids.h"
+#include "chrome/common/metrics/variations/variation_ids.h"
 
 // This namespace provides various helpers that extend the functionality around
 // base::FieldTrial.
@@ -123,4 +123,4 @@ uint32 TestHashName(const std::string& name);
 
 }  // namespace testing
 
-#endif  // CHROME_COMMON_METRICS_VARIATIONS_UTIL_H_
+#endif  // CHROME_COMMON_METRICS_VARIATIONS_VARIATIONS_UTIL_H_
diff --git a/chrome/common/metrics/variations_util_unittest.cc b/chrome/common/metrics/variations/variations_util_unittest.cc
index dbe2732..24d8fd4 100644
--- a/chrome/common/metrics/variations_util_unittest.cc
+++ b/chrome/common/metrics/variations/variations_util_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/metrics/field_trial.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "content/public/test/test_browser_thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
diff --git a/chrome/renderer/chrome_render_process_observer.cc b/chrome/renderer/chrome_render_process_observer.cc
index a99d5e3..70e7bed 100644
--- a/chrome/renderer/chrome_render_process_observer.cc
+++ b/chrome/renderer/chrome_render_process_observer.cc
@@ -21,7 +21,7 @@
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_localization_peer.h"
-#include "chrome/common/metrics/variations_util.h"
+#include "chrome/common/metrics/variations/variations_util.h"
 #include "chrome/common/net/net_resource_provider.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/renderer/chrome_content_renderer_client.h"