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.h

+// 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_H_
+#define CHROME_BROWSER_METRICS_VARIATIONS_RESOURCE_REQUEST_ALLOWED_NOTIFIER_H_
+
+#include "base/observer_list.h"
+#include "net/base/network_change_notifier.h"
+
+#if defined(OS_CHROMEOS)
+#include "content/public/browser/notification_observer.h"
+#include "content/public/browser/notification_registrar.h"
+#endif
+
+#if defined(OS_CHROMEOS)
+namespace chromeos {
+class WizardController;
+}
+#endif
+
+// This class informs an interested observer when resource requests over the
+// network are permitted.
+//
+// Currently, the criteria for allowing resource requests include:
+//  1. The network is currently available.
+//  2. The EULA was accepted by the user (ChromeOS only).
+//
+// Interested services should add themselves as an observer of
+// ResourceRequestAllowedNotifier and check ResourceRequestsAllowed() to see if
+// requests are permitted. If it returns true, they can go ahead and make their
+// request. If it returns false, ResourceRequestAllowedNotifier will notify the
+// service when the criteria is met.
+//
+// If the ResourceRequestsAllowed returns true the first time,

[Alexei Svitkine (slow), 2012/09/19 20:05:35]

Nit: remove the first "the".

[SteveT, 2012/09/20 19:40:18]

Done.

+// ResourceRequestAllowedNotifier will not notify the service in the future.
+//
+// Note that this class handles the criteria state for a single service, so
+// services should keep their own instance of this class rather than sharing a
+// global instance.
+class ResourceRequestAllowedNotifier :
+#if defined(OS_CHROMEOS)
+    public content::NotificationObserver,
+#endif
+    public net::NetworkChangeNotifier::ConnectionTypeObserver {
+ public:
+  // Observes resource request allowed state changes.
+  class Observer {
+   public:
+    virtual void OnResourceRequestsAllowed() = 0;
+  };
+
+  // Note that the constructor has some logic to register for notifications from
+  // the WizardController if the EULA was not accepted at startup (ChromeOS
+  // only).
+  ResourceRequestAllowedNotifier();
+  virtual ~ResourceRequestAllowedNotifier();
+
+  // Sets |observer| as the observing service to be notified.

[Alexei Svitkine (slow), 2012/09/19 20:05:35]

Mention that this is a weak reference.

[SteveT, 2012/09/20 19:40:18]

Removed this completely since we now take in that dependency in the ctor.

+  void SetObserver(Observer* observer);
+
+  // Clears the current observer.
+  void ClearObserver();
+
+  // Returns true iff all resource request criteria is met. If not, this call

[Alexei Svitkine (slow), 2012/09/19 20:05:35]

Nit: "is met" -> "are met". ("criteria" is plural, the singular is "criterion").

[SteveT, 2012/09/20 19:40:18]

Done.

+  // will set some flags so it knows to notify the observer if the criteria
+  // changes. This is virtual so it can be overriden for tests.
+  virtual bool ResourceRequestsAllowed();
+
+  void SetWasWaitingForNetworkForTesting(bool waiting);
+#if defined(OS_CHROMEOS)
+  void SetWasWaitingForEulaForTesting(bool waiting);
+#endif
+
+ protected:
+  // Notifies observers if all criteria needed for resource requests are met.
+  // This is protected so it can be called from subclasses for testing.
+  void MaybeNotifyObservers();
+
+ private:
+#if defined(OS_CHROMEOS)
+  // content::NotificationObserver overrides:
+  virtual void Observe(int type,
+                       const content::NotificationSource& source,
+                       const content::NotificationDetails& details) OVERRIDE;
+
+  // net::NetworkChangeNotifier::ConnectionTypeObserver implementation.

[Alexei Svitkine (slow), 2012/09/19 20:05:35]

Nit: Use a consistent style for the comment.

You use "content::NotificationObserver overrides:" above, but 
"net::NetworkChangeNotifier::ConnectionTypeObserver implementation." here.

[SteveT, 2012/09/20 19:40:18]

Using "overrides:"

+  virtual void OnConnectionTypeChanged(

[Alexei Svitkine (slow), 2012/09/19 20:05:35]

I don't think this should be in an ifdef CHROMEOS block.

[SteveT, 2012/09/20 19:40:18]

Correct. Will have to rerun those other trybots and retest this on chromeos=0...

+      net::NetworkChangeNotifier::ConnectionType type) OVERRIDE;
+
+  content::NotificationRegistrar registrar_;
+
+  // Tracks EULA acceptance criteria.
+  bool was_waiting_for_user_to_accept_eula_;
+#endif
+
+  // Tracks network connectivity criteria.
+  bool was_waiting_for_network_;
+
+  // Observing service interested in request permissions.
+  Observer* observer_;
+
+  DISALLOW_COPY_AND_ASSIGN(ResourceRequestAllowedNotifier);
+};
+
+#endif  // CHROME_BROWSER_METRICS_VARIATIONS_RESOURCE_REQUEST_ALLOWED_NOTIFIER_H_