Revert "Do not send stats from Chromium builds."

This reverts commit 4a0189db765fe94f5df360c0907a585e26c9f681.

Revert "Fix build break."
This reverts commit eada493cf28975e56395aa3e2d3a0dc267a7f2c7.

Review URL: http://codereview.chromium.org/92162


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

2 files changed, 6 insertions, 11 deletions

diff --git a/chrome/browser/metrics/metrics_service.cc b/chrome/browser/metrics/metrics_service.cc
index 7a92853..1e447ea 100644
--- a/chrome/browser/metrics/metrics_service.cc
+++ b/chrome/browser/metrics/metrics_service.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2008 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.
 
@@ -186,7 +186,6 @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/pref_service.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/installer/util/browser_distribution.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/load_flags.h"
 #include "third_party/bzip2/bzlib.h"
@@ -204,6 +203,9 @@ using base::TimeDelta;
 // Check to see that we're being called on only one thread.
 static bool IsSingleThreaded();
 
+static const char kMetricsURL[] =
+    "https://clients4.google.com/firefox/metrics/collect";
+
 static const char kMetricsType[] = "application/vnd.mozilla.metrics.bz2";
 
 // The delay, in seconds, after startup before sending the first log message.
@@ -593,9 +595,6 @@ void MetricsService::RecordBreakpadHasDebugger(bool has_debugger) {
 // Initialization methods
 
 void MetricsService::InitializeMetricsState() {
-  BrowserDistribution* dist = BrowserDistribution::GetDistribution();
-  server_url_ = dist->GetStatsServerURL();
-
   PrefService* pref = g_browser_process->local_state();
   DCHECK(pref);
 
@@ -1151,8 +1150,7 @@ void MetricsService::PrepareFetchWithPendingLog() {
     return;
   }
 
-  current_fetch_.reset(new URLFetcher(GURL(WideToUTF16(server_url_)),
-                                      URLFetcher::POST,
+  current_fetch_.reset(new URLFetcher(GURL(kMetricsURL), URLFetcher::POST,
                                       this));
   current_fetch_->set_request_context(Profile::GetDefaultRequestContext());
   current_fetch_->set_upload_data(kMetricsType, compressed_log);
@@ -1315,7 +1313,7 @@ void MetricsService::OnURLFetchComplete(const URLFetcher* source,
 
 void MetricsService::HandleBadResponseCode() {
   LOG(INFO) << "Verify your metrics logs are formatted correctly.  "
-               "Verify server is active at " << server_url_;
+      "Verify server is active at " << kMetricsURL;
   if (!pending_log()) {
     LOG(INFO) << "METRICS: Recorder shutdown during log transmission.";
   } else {
diff --git a/chrome/browser/metrics/metrics_service.h b/chrome/browser/metrics/metrics_service.h
index 426c66e..d5fa3c1 100644
--- a/chrome/browser/metrics/metrics_service.h
+++ b/chrome/browser/metrics/metrics_service.h
@@ -411,9 +411,6 @@ class MetricsService : public NotificationObserver,
   // The log that we are still appending to.
   MetricsLog* current_log_;
 
-  // The URL for the metrics server.
-  std::wstring server_url_;
-
   // The identifier that's sent to the server with the log reports.
   std::string client_id_;