Dead code removal: remove MetricsResponse implementation and tests

BUG=none


Review URL: https://chromiumcodereview.appspot.com/10834057

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

chrome/browser/metrics/metrics_response.cc

-// 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.
-
-#include "chrome/browser/metrics/metrics_response.h"
-
-#include "libxml/parser.h"
-
-// State to pass around during SAX parsing.
-struct SAXState {
-  int collectors;
-  int events;
-  int interval;
-};
-
-// libxml uses xmlChar*, which is unsigned char*
-inline const char* Char(const xmlChar* input) {
-  return reinterpret_cast<const char*>(input);
-}
-
-static void SAXStartElement(void* user_data,
-                            const xmlChar* name,
-                            const xmlChar** attrs) {
-  if (!name || !attrs)
-    return;
-
-  SAXState* state = static_cast<SAXState*>(user_data);
-
-  if (strcmp(Char(name), "upload") == 0) {
-    for (int i = 0; attrs[i] && attrs[i + i]; i += 2) {
-      if (strcmp(Char(attrs[i]), "interval") == 0) {
-        state->interval = atoi(Char(attrs[i + 1]));
-        return;
-      }
-    }
-  } else if (strcmp(Char(name), "limit") == 0) {
-    for (int i = 0; attrs[i] && attrs[i + 1]; i += 2) {
-      if (strcmp(Char(attrs[i]), "events") == 0) {
-        state->events = atoi(Char(attrs[i + 1]));
-        return;
-      }
-    }
-  } else if (strcmp(Char(name), "collector") == 0) {
-    for (int i = 0; attrs[i] && attrs[i + 1]; i += 2) {
-      if (strcmp(Char(attrs[i]), "type") == 0) {
-        const char* type = Char(attrs[i + 1]);
-        if (strcmp(type, "document") == 0) {
-          state->collectors |= MetricsResponse::COLLECTOR_DOCUMENT;
-        } else if (strcmp(type, "profile") == 0) {
-          state->collectors |= MetricsResponse::COLLECTOR_PROFILE;
-        } else if (strcmp(type, "window") == 0) {
-          state->collectors |= MetricsResponse::COLLECTOR_WINDOW;
-        } else if (strcmp(type, "ui") == 0) {
-          state->collectors |= MetricsResponse::COLLECTOR_UI;
-        }
-        return;
-      }
-    }
-  }
-}
-
-MetricsResponse::MetricsResponse(const std::string& response_xml)
-    : valid_(false),
-      collectors_(COLLECTOR_NONE),
-      events_(0),
-      interval_(0) {
-  if (response_xml.empty())
-    return;
-
-  xmlSAXHandler handler = {0};
-  handler.startElement = SAXStartElement;
-  SAXState state = {0};
-
-  valid_ = !xmlSAXUserParseMemory(&handler, &state,
-                                  response_xml.data(),
-                                  static_cast<int>(response_xml.size()));
-
-  collectors_ = state.collectors;
-  events_ = state.events;
-  interval_ = state.interval;
-}

chrome/browser/metrics/metrics_response.h

-// Copyright (c) 2010 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.
-
-// This class exists to interpret the response from the metrics server.
-
-#ifndef CHROME_BROWSER_METRICS_METRICS_RESPONSE_H_
-#define CHROME_BROWSER_METRICS_METRICS_RESPONSE_H_
-
-#include <string>
-
-#include "base/basictypes.h"
-
-class MetricsResponse {
- public:
-  // Parses metrics response XML into the information we care about
-  // (how often to send metrics info, which info to send).
-  explicit MetricsResponse(const std::string& response_xml);
-
-  // True if the XML passed to the constructor was valid and parseable.
-  bool valid() { return valid_; }
-
-  // Each flag (except NONE) defined here represents one type of metrics
-  // event that the server is interested in.
-  enum CollectorType {
-    COLLECTOR_NONE = 0x0,
-    COLLECTOR_PROFILE = 0x1,
-    COLLECTOR_WINDOW = 0x2,
-    COLLECTOR_DOCUMENT = 0x4,
-    COLLECTOR_UI = 0x8
-  };
-
-  // This is the collection of CollectorTypes that are desired by the
-  // server, ORed together into one value.
-  int collectors() { return collectors_; }
-
-  // Returns true if the given CollectorType is desired by the server.
-  bool collector_active(CollectorType type) { return !!(collectors_ & type); }
-
-  // Returns the maximum number of event that the server wants in each
-  // metrics log sent.  (If 0, no value was provided.)
-  int events() { return events_; }
-
-  // Returns the size of the time interval that the server wants us to include
-  // in each log (in seconds).  (If 0, no value was provided.)
-  int interval() { return interval_; }
-
- private:
-  bool valid_;
-  int collectors_;
-  int events_;
-  int interval_;
-
-  DISALLOW_COPY_AND_ASSIGN(MetricsResponse);
-};
-
-#endif  // CHROME_BROWSER_METRICS_METRICS_RESPONSE_H_

chrome/browser/metrics/metrics_response_unittest.cc

-// 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.
-
-#include <string>
-
-#include "chrome/browser/metrics/metrics_response.h"
-#include "chrome/browser/metrics/metrics_service.h"
-#include "base/string_util.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace {
-  class MetricsResponseTest : public testing::Test {
-  };
-};
-
-static const char kNoLogResponse[] =
-    "<response xmlns=\"http://www.mozilla.org/metrics\"><config>"
-    "</config></response>";
-
-static const char kLogResponse1[] =
-    "<response xmlns=\"http://www.mozilla.org/metrics\"><config>"
-      "<collectors>"
-        "<collector type=\"profile\"/>"
-        "<collector type=\"document\"/>"
-        "<collector type=\"window\"/>"
-        "<collector type=\"ui\"/>"
-      "</collectors>"
-      "<limit events=\"500\"/><upload interval=\"600\"/>"
-    "</config></response>";
-
-static const char kLogResponse2[] =
-    "<response xmlns=\"http://www.mozilla.org/metrics\"><config>"
-      "<collectors>"
-        "<collector type=\"profile\"/>"
-        "<collector type=\"document\"/>"
-        "<collector type=\"window\"/>"
-      "</collectors>"
-      "<limit events=\"250\"/><upload interval=\"900\"/>"
-    "</config></response>";
-
-
-static const struct ResponseCase {
-  const char* response_xml;
-  int collectors;
-  int events;
-  int interval;
-  bool profile_active;
-  bool window_active;
-  bool document_active;
-  bool ui_active;
-} response_cases[] = {
-  {
-    kNoLogResponse,
-    MetricsResponse::COLLECTOR_NONE,
-    0, 0,
-    false, false, false, false
-  },
-  {
-    kLogResponse1,
-    MetricsResponse::COLLECTOR_PROFILE |
-        MetricsResponse::COLLECTOR_DOCUMENT |
-        MetricsResponse::COLLECTOR_WINDOW |
-        MetricsResponse::COLLECTOR_UI,
-    500, 600,
-    true, true, true, true
-  },
-  {
-    kLogResponse2,
-    MetricsResponse::COLLECTOR_PROFILE |
-        MetricsResponse::COLLECTOR_DOCUMENT |
-        MetricsResponse::COLLECTOR_WINDOW,
-    250, 900,
-    true, true, true, false
-  },
-};
-
-TEST(MetricsResponseTest, ParseResponse) {
-  for (size_t i = 0; i < arraysize(response_cases); ++i) {
-    ResponseCase rcase = response_cases[i];
-    MetricsResponse response(rcase.response_xml);
-    EXPECT_TRUE(response.valid());
-    EXPECT_EQ(rcase.collectors, response.collectors()) <<
-        "Mismatch in case " << i;
-    EXPECT_EQ(rcase.events, response.events()) << "Mismatch in case " << i;
-    EXPECT_EQ(rcase.interval, response.interval()) << "Mismatch in case " << i;
-    EXPECT_EQ(rcase.profile_active,
-              response.collector_active(MetricsResponse::COLLECTOR_PROFILE)) <<
-              "Mismatch in case " << i;
-    EXPECT_EQ(rcase.window_active,
-              response.collector_active(MetricsResponse::COLLECTOR_WINDOW)) <<
-              "Mismatch in case " << i;
-    EXPECT_EQ(rcase.document_active,
-              response.collector_active(MetricsResponse::COLLECTOR_DOCUMENT)) <<
-              "Mismatch in case " << i;
-    EXPECT_EQ(rcase.ui_active,
-              response.collector_active(MetricsResponse::COLLECTOR_UI)) <<
-              "Mismatch in case " << i;
-  }
-}
-
-static const char* bogus_responses[] = {"", "<respo"};
-TEST(MetricsResponseTest, ParseBogusResponse) {
-  for (size_t i = 0; i < arraysize(bogus_responses); ++i) {
-    MetricsResponse response(bogus_responses[i]);
-    EXPECT_FALSE(response.valid());
-  }
-}

chrome/chrome_browser.gypi

@@ -1438,8 +1438,6 @@
         'browser/metrics/metrics_log_serializer.h',
         'browser/metrics/metrics_reporting_scheduler.cc',
         'browser/metrics/metrics_reporting_scheduler.h',
-        'browser/metrics/metrics_response.cc',
-        'browser/metrics/metrics_response.h',
         'browser/metrics/metrics_service.cc',
         'browser/metrics/metrics_service.h',
         'browser/metrics/thread_watcher.cc',

chrome/chrome_tests.gypi

@@ -1350,7 +1350,6 @@
         'browser/media_gallery/media_gallery_database_unittest.cc',
         'browser/metrics/metrics_log_unittest.cc',
         'browser/metrics/metrics_log_serializer_unittest.cc',
-        'browser/metrics/metrics_response_unittest.cc',
         'browser/metrics/metrics_service_unittest.cc',
         'browser/metrics/thread_watcher_unittest.cc',
         'browser/metrics/variations_service_unittest.cc',