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

chrome/browser/metrics/variations/variations_service.cc

 // 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.
 
 #include "chrome/browser/metrics/variations/variations_service.h"
 
 #include <set>
 
 #include "base/base64.h"
 #include "base/build_time.h"
@@ skipping 82 matching lines @@
   GURL url_as_gurl = GURL(server_url);
   DCHECK(url_as_gurl.is_valid());
   return url_as_gurl;
 }
 
 }  // namespace
 
 VariationsService::VariationsService()
     : variations_server_url_(GetVariationsServerURL()),
       create_trials_from_seed_called_(false),
+#if defined(OS_CHROMEOS)
+      waiting_for_user_to_accept_eula_(false),
+#endif
       was_offline_during_last_request_attempt_(false) {
-  net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
+  resource_request_allowed_notifier_.AddObserver(this);
 }
 
 VariationsService::~VariationsService() {
-  net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
+  resource_request_allowed_notifier_.RemoveObserver(this);
 }
 
 bool VariationsService::CreateTrialsFromSeed(PrefService* local_prefs) {
   create_trials_from_seed_called_ = true;
 
   TrialsSeed seed;
   if (!LoadTrialsSeedFromPref(local_prefs, &seed))
     return false;
 
   const int64 date_value = local_prefs->GetInt64(prefs::kVariationsSeedDate);
@@ skipping 37 matching lines @@
 
   was_offline_during_last_request_attempt_ =
       net::NetworkChangeNotifier::IsOffline();
   UMA_HISTOGRAM_BOOLEAN("Variations.NetworkAvailability",
                         !was_offline_during_last_request_attempt_);
   if (was_offline_during_last_request_attempt_) {
     DVLOG(1) << "Network was offline.";
     return;
   }
 
+#if defined(OS_CHROMEOS)
+  if (!ResourceRequestAllowedNotifier::IsEulaAccepted()) {
+    // The ResourceRequestAllowedNotifier should notify this class when the EULA
+    // has been accepted.
+    VLOG(1) << "EULA was not accepted.";
+    waiting_for_user_to_accept_eula_ = true;
+    return;
+  }
+#endif
+
   pending_seed_request_.reset(net::URLFetcher::Create(
       variations_server_url_, net::URLFetcher::GET, this));
   pending_seed_request_->SetLoadFlags(net::LOAD_DO_NOT_SEND_COOKIES |
                                       net::LOAD_DO_NOT_SAVE_COOKIES);
   pending_seed_request_->SetRequestContext(
       g_browser_process->system_request_context());
   pending_seed_request_->SetMaxRetries(kMaxRetrySeedFetch);
   if (!variations_serial_number_.empty()) {
     pending_seed_request_->AddExtraRequestHeader("If-Match:" +
                                                  variations_serial_number_);
   }
   pending_seed_request_->Start();
 }
 
 void VariationsService::SetWasOfflineDuringLastRequestAttemptForTesting(
     bool offline) {
   was_offline_during_last_request_attempt_ = offline;
 }
 
+void VariationsService::OnNetworkChangedToActiveConnection() {
+  // If the connection type is back online, start a request if the last request
+  // failed due to being offline.
+  if (was_offline_during_last_request_attempt_) {
+    VLOG(1) << "Retrying fetch due to network reconnect.";
+    FetchVariationsSeed();
+
+    // Since FetchVariationsSeed was explicitly called here, reset the timer to
+    // avoid retrying for a full period.
+    // ResourceRequestAllowedNotifier::IsNetworkOffline may be inconsistent with
+    // calls to OnNetworkChangedToActiveConnection, so we check if
+    // FetchVariationsSeed set |was_offline_during_last_request_attempt_| to
+    // true before we reset the timer.
+    if (!was_offline_during_last_request_attempt_ && timer_.IsRunning())
+      timer_.Reset();
+  }
+}
+
+#if defined(OS_CHROMEOS)
+void VariationsService::OnEulaAccepted() {
+  // If an earlier request attempt was aborted because the EULA was not
+  // accepted, retry the request now.
+  // Note that if the EULA check succeeded earlier, this just returns.
+  if (!waiting_for_user_to_accept_eula_)
+    return;
+  DCHECK(ResourceRequestAllowedNotifier::IsEulaAccepted());
+  waiting_for_user_to_accept_eula_ = false;
+
+  VLOG(1) << "Starting ping because the EULA was accepted.";
+  FetchVariationsSeed();
+
+  // Since FetchVariationsSeed was explicitly called here, reset the timer to
+  // avoid retrying for a full period.
+  if (timer_.IsRunning())
+    timer_.Reset();
+}
+#endif
+
 // static
 void VariationsService::RegisterPrefs(PrefService* prefs) {
   prefs->RegisterStringPref(prefs::kVariationsSeed, std::string());
   prefs->RegisterInt64Pref(prefs::kVariationsSeedDate,
                            base::Time().ToInternalValue());
 }
 
 void VariationsService::OnURLFetchComplete(const net::URLFetcher* source) {
   DCHECK_EQ(pending_seed_request_.get(), source);
   // The fetcher will be deleted when the request is handled.
@@ skipping 14 matching lines @@
   bool success = request->GetResponseAsString(&seed_data);
   DCHECK(success);
 
   base::Time response_date;
   success = request->GetResponseHeaders()->GetDateValue(&response_date);
   DCHECK(success || response_date.is_null());
 
   StoreSeedData(seed_data, response_date, g_browser_process->local_state());
 }
 
-void VariationsService::OnConnectionTypeChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
-  // If the connection type is back online, start a request if the last request
-  // failed due to being offline.
-  if (was_offline_during_last_request_attempt_ &&
-      type != net::NetworkChangeNotifier::CONNECTION_NONE) {
-    VLOG(1) << "Retrying fetch due to network reconnect.";
-    FetchVariationsSeed();
-
-    // Since FetchVariationsSeed was explicitly called here, reset the timer to
-    // avoid retrying for a full period.
-    // net::NetworkChangeNotifier::IsOffline may be inconsistent with |type|, so
-    // we check if FetchVariationsSeed set
-    // |was_offline_during_last_request_attempt_| to true before we reset the
-    // timer.
-    if (!was_offline_during_last_request_attempt_ && timer_.IsRunning())
-      timer_.Reset();
-  }
-}
-
 bool VariationsService::StoreSeedData(const std::string& seed_data,
                                       const base::Time& seed_date,
                                       PrefService* local_prefs) {
   // Only store the seed data if it parses correctly.
   TrialsSeed seed;
   if (!seed.ParseFromString(seed_data)) {
     VLOG(1) << "Variations Seed data from server is not in valid proto format, "
             << "rejecting the seed.";
     return false;
   }
@@ skipping 246 matching lines @@
                                       variation_id);
     }
   }
 
   trial->SetForced();
   if (IsStudyExpired(study, reference_date))
     trial->Disable();
 }
 
 }  // namespace chrome_variations