Activate the VariationsService for ChromeOS and ensure that it does not ping the server until the E…

chrome/browser/metrics/variations/resource_request_allowed_notifier_test_util.h

Index: chrome/browser/metrics/variations/resource_request_allowed_notifier_test_util.h
diff --git a/chrome/browser/metrics/variations/resource_request_allowed_notifier_test_util.h b/chrome/browser/metrics/variations/resource_request_allowed_notifier_test_util.h
new file mode 100644
index 0000000000000000000000000000000000000000..4dc4114c36ccfcc60faae7206c66b0eab0c15096
--- /dev/null
+++ b/chrome/browser/metrics/variations/resource_request_allowed_notifier_test_util.h
@@ -0,0 +1,52 @@
+// Copyright (c) 2012 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.
+
+#ifndef CHROME_BROWSER_METRICS_VARIATIONS_RESOURCE_REQUEST_ALLOWED_NOTIFIER_TEST_UTIL_H_
+#define CHROME_BROWSER_METRICS_VARIATIONS_RESOURCE_REQUEST_ALLOWED_NOTIFIER_TEST_UTIL_H_
+
+#include "chrome/browser/metrics/variations/resource_request_allowed_notifier.h"
+
+// A light wrapper class around ResourceRequestAllowedNotifier used to expose

[Alexei Svitkine (slow), 2012/09/21 15:52:05]

I don't think "wrapper" is the right terminology here, I think "subclass" is the
correct term to use instead.

[SteveT, 2012/09/24 15:38:38]

Done.

+// some functionality for testing.

[Alexei Svitkine (slow), 2012/09/21 15:52:05]

Nit: Add an empty line within the comment here.

[SteveT, 2012/09/24 15:38:38]

Done.

+// By default, the constructor sets this class to override
+// ResourceRequestsAllowed, so its state can be set with SetRequestsAllowed.
+// This is meant for higher level tests of services to ensure they adhere to the
+// notifications of the ResourceRequestAllowedNotifier. Lower level tests can
+// disable this by calling OverrideRequestsAllowed(false).
+class TestRequestAllowedNotifier : public ResourceRequestAllowedNotifier {
+ public:
+  TestRequestAllowedNotifier();
+  virtual ~TestRequestAllowedNotifier();
+
+#if defined(OS_CHROMEOS)
+  void SetEulaAccepted(bool accepted);
+#endif
+
+  void SetRequestsAllowed(bool allowed);
+
+  // If |override| is false, ResourceRequestsAllowed will call the base class
+  // implementation. Otherwise, it will return |requests_allowed_|.
+  void OverrideRequestsAllowed(bool override);

[Alexei Svitkine (slow), 2012/09/21 15:52:05]

Could this be simplified and merged with SetRequestsAllowed?

e.g. only have one method instead of two, and call it:

void SetRequestsAllowedOverride(bool allowed);

This would set |override_requests_allowed_| to true and |requests_allowed_| to
|allowed|.

[SteveT, 2012/09/24 15:38:38]

That simplified things a bit, yeah. Done.

+
+  // Notify observers that requests are allowed.
+  void NotifyObservers();
+
+ protected:
+#if defined(OS_CHROMEOS)
+  virtual bool IsEulaAccepted() OVERRIDE;
+#endif
+
+  virtual bool ResourceRequestsAllowed() OVERRIDE;
+
+ private:
+  bool requests_allowed_;
+#if defined(OS_CHROMEOS)
+  bool eula_accepted_;
+#endif
+  bool override_requests_allowed_;
+
+  DISALLOW_COPY_AND_ASSIGN(TestRequestAllowedNotifier);
+};
+
+#endif  // CHROME_BROWSER_METRICS_VARIATIONS_RESOURCE_REQUEST_ALLOWED_NOTIFIER_TEST_UTIL_H_