Re-enable rappor for vrshell

components/rappor/rappor_utils.cc

 // Copyright 2015 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 "components/rappor/rappor_utils.h"
 
 #include "components/rappor/rappor_service.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
@@ skipping 27 matching lines @@
                                      const std::string& metric,
                                      const GURL& gurl) {
   if (!rappor_service)
     return;
   rappor_service->RecordSample(
       metric,
       rappor::ETLD_PLUS_ONE_RAPPOR_TYPE,
       GetDomainAndRegistrySampleFromGURL(gurl));
 }
 
+void TrySampleDomainAndRegistryWithDefaultService(const std::string& metric,

[ddorwin, 2016/11/28 21:45:42]

Since we don't even check whether there is a default service, could we just have
callers pass GetDefaultService() and eliminate the need for this?

[billorr, 2016/11/28 23:13:03]

Done.

+                                                  const GURL& gurl) {
+  RapporService* defaultService = TryGetDefaultService();
+  SampleDomainAndRegistryFromGURL(defaultService, metric, gurl);
+}
+
+RapporService* TryGetDefaultService() {
+  return (GetDefaultService != nullptr) ? GetDefaultService() : nullptr;
+}
+
+RapporService* (*GetDefaultService)() = nullptr;
+
 }  // namespace rappor