Revert "shill: Add a GMock printer for ::DBus::Variant types"
This reverts commit 6bd571a68d6b5468f7f9e06dc5ef4b479eccdbbf
This was broken by the revert of gtest 1.6
Change-Id: I1fa7f944dbc31ceae9f241579ba9e8aa8685062c
Reviewed-on: https://gerrit.chromium.org/gerrit/47142
Reviewed-by: Ronald G. Minnich <rminnich@chromium.org>
Reviewed-by: Sonny Rao <sonnyrao@chromium.org>
Tested-by: Sonny Rao <sonnyrao@chromium.org>
diff --git a/Makefile b/Makefile
index 7c1751b..8e34018 100644
--- a/Makefile
+++ b/Makefile
@@ -341,7 +341,6 @@
dbus_adaptor_unittest.o \
dbus_manager_unittest.o \
dbus_properties_unittest.o \
- dbus_variant_gmock_printer.o \
default_profile_unittest.o \
device_info_unittest.o \
device_unittest.o \
diff --git a/dbus_properties.h b/dbus_properties.h
index db678f2..8239291 100644
--- a/dbus_properties.h
+++ b/dbus_properties.h
@@ -13,7 +13,6 @@
#include <dbus-c++/types.h>
#include "shill/accessor_interface.h"
-#include "shill/dbus_variant_gmock_printer.h"
namespace shill {
diff --git a/dbus_variant_gmock_printer.cc b/dbus_variant_gmock_printer.cc
deleted file mode 100644
index bd67d3b..0000000
--- a/dbus_variant_gmock_printer.cc
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright (c) 2013 The Chromium OS 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 "shill/dbus_variant_gmock_printer.h"
-
-#include <gmock/gmock.h>
-
-#include "shill/dbus_adaptor.h"
-
-namespace DBus {
-
-void PrintTo(const ::DBus::Variant &value, ::std::ostream *os) {
- if (shill::DBusAdaptor::IsBool(value.signature()))
- *os << value.reader().get_bool();
- else if (shill::DBusAdaptor::IsByte(value.signature()))
- *os << value.reader().get_byte();
- else if (shill::DBusAdaptor::IsInt16(value.signature()))
- *os << value.reader().get_int16();
- else if (shill::DBusAdaptor::IsInt32(value.signature()))
- *os << value.reader().get_int32();
- else if (shill::DBusAdaptor::IsPath(value.signature()))
- *os << value.reader().get_path();
- else if (shill::DBusAdaptor::IsString(value.signature()))
- *os << value.reader().get_string();
- else if (shill::DBusAdaptor::IsStringmap(value.signature()))
- *os << testing::PrintToString(value.operator shill::Stringmap());
- else if (shill::DBusAdaptor::IsStringmaps(value.signature()))
- *os << testing::PrintToString(value.operator shill::Stringmaps());
- else if (shill::DBusAdaptor::IsStrings(value.signature()))
- *os << testing::PrintToString(value.operator shill::Strings());
- else if (shill::DBusAdaptor::IsUint16(value.signature()))
- *os << value.reader().get_uint16();
- else if (shill::DBusAdaptor::IsUint32(value.signature()))
- *os << value.reader().get_uint32();
- else if (shill::DBusAdaptor::IsUint64(value.signature()))
- *os << value.reader().get_uint64();
- else
- *os << "(Do not know how to print: unknown type: " << value.signature()
- << ")";
-}
-
-} // namespace DBus
diff --git a/dbus_variant_gmock_printer.h b/dbus_variant_gmock_printer.h
deleted file mode 100644
index c0fe6ad..0000000
--- a/dbus_variant_gmock_printer.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright (c) 2013 The Chromium OS 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 SHILL_DBUS_VARIANT_GMOCK_PRINTER_H_
-#define SHILL_DBUS_VARIANT_GMOCK_PRINTER_H_
-
-#include <dbus-c++/types.h>
-
-namespace DBus {
-
-// A GMock printer for DBus::Variant types. This also suppresses
-// GMock from attempting (and failing) to generate its own printer
-// for DBus::Variant.
-void PrintTo(const ::DBus::Variant& var, ::std::ostream* os);
-
-} // namespace DBus
-
-#endif // SHILL_DBUS_VARIANT_GMOCK_PRINTER_H_
diff --git a/mock_supplicant_interface_proxy.h b/mock_supplicant_interface_proxy.h
index 69f903d..289231c 100644
--- a/mock_supplicant_interface_proxy.h
+++ b/mock_supplicant_interface_proxy.h
@@ -11,7 +11,6 @@
#include <base/basictypes.h>
#include <gmock/gmock.h>
-#include "shill/dbus_variant_gmock_printer.h"
#include "shill/refptr_types.h"
#include "shill/supplicant_interface_proxy_interface.h"
diff --git a/mock_supplicant_process_proxy.h b/mock_supplicant_process_proxy.h
index ec4a1a0..a8fb934 100644
--- a/mock_supplicant_process_proxy.h
+++ b/mock_supplicant_process_proxy.h
@@ -11,7 +11,6 @@
#include <base/basictypes.h>
#include <gmock/gmock.h>
-#include "shill/dbus_variant_gmock_printer.h"
#include "shill/supplicant_process_proxy_interface.h"
namespace shill {