Move files inside chrome/browser/chromeos/dbus to chromeos/dbus

chrome/browser/chromeos/dbus/flimflam_client_helper.cc

Index: chrome/browser/chromeos/dbus/flimflam_client_helper.cc
diff --git a/chrome/browser/chromeos/dbus/flimflam_client_helper.cc b/chrome/browser/chromeos/dbus/flimflam_client_helper.cc
deleted file mode 100644
index a3a6a2c71b236d669505c53a022fa9115e177db6..0000000000000000000000000000000000000000
--- a/chrome/browser/chromeos/dbus/flimflam_client_helper.cc
+++ /dev/null
@@ -1,111 +0,0 @@
-// 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/chromeos/dbus/flimflam_client_helper.h"
-
-#include "base/bind.h"
-#include "base/values.h"
-#include "dbus/message.h"
-#include "dbus/object_proxy.h"
-#include "dbus/values_util.h"
-#include "third_party/cros_system_api/dbus/service_constants.h"
-
-namespace chromeos {
-
-FlimflamClientHelper::FlimflamClientHelper(dbus::ObjectProxy* proxy)
-    : weak_ptr_factory_(this),
-      proxy_(proxy) {
-}
-
-FlimflamClientHelper::~FlimflamClientHelper() {
-}
-
-void FlimflamClientHelper::SetPropertyChangedHandler(
-    const PropertyChangedHandler& handler) {
-  property_changed_handler_ = handler;
-}
-
-void FlimflamClientHelper::ResetPropertyChangedHandler() {
-  property_changed_handler_.Reset();
-}
-
-void FlimflamClientHelper::MonitorPropertyChanged(
-    const std::string& interface_name) {
-  // We are not using dbus::PropertySet to monitor PropertyChanged signal
-  // because the interface is not "org.freedesktop.DBus.Properties".
-  proxy_->ConnectToSignal(interface_name,
-                          flimflam::kMonitorPropertyChanged,
-                          base::Bind(&FlimflamClientHelper::OnPropertyChanged,
-                                     weak_ptr_factory_.GetWeakPtr()),
-                          base::Bind(&FlimflamClientHelper::OnSignalConnected,
-                                     weak_ptr_factory_.GetWeakPtr()));
-}
-
-void FlimflamClientHelper::CallVoidMethod(dbus::MethodCall* method_call,
-                                          const VoidCallback& callback) {
-  proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                     base::Bind(&FlimflamClientHelper::OnVoidMethod,
-                                weak_ptr_factory_.GetWeakPtr(),
-                                callback));
-}
-
-void FlimflamClientHelper::CallDictionaryValueMethod(
-    dbus::MethodCall* method_call,
-    const DictionaryValueCallback& callback) {
-  proxy_->CallMethod(method_call, dbus::ObjectProxy::TIMEOUT_USE_DEFAULT,
-                     base::Bind(&FlimflamClientHelper::OnDictionaryValueMethod,
-                                weak_ptr_factory_.GetWeakPtr(),
-                                callback));
-}
-
-void FlimflamClientHelper::OnSignalConnected(const std::string& interface,
-                                             const std::string& signal,
-                                             bool success) {
-  LOG_IF(ERROR, !success) << "Connect to " << interface << " " << signal
-                          << " failed.";
-}
-
-void FlimflamClientHelper::OnPropertyChanged(dbus::Signal* signal) {
-  if (property_changed_handler_.is_null())
-    return;
-
-  dbus::MessageReader reader(signal);
-  std::string name;
-  if (!reader.PopString(&name))
-    return;
-  scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
-  if (!value.get())
-    return;
-  property_changed_handler_.Run(name, *value);
-}
-
-void FlimflamClientHelper::OnVoidMethod(const VoidCallback& callback,
-                                        dbus::Response* response) {
-  if (!response) {
-    callback.Run(DBUS_METHOD_CALL_FAILURE);
-    return;
-  }
-  callback.Run(DBUS_METHOD_CALL_SUCCESS);
-}
-
-void FlimflamClientHelper::OnDictionaryValueMethod(
-    const DictionaryValueCallback& callback,
-    dbus::Response* response) {
-  if (!response) {
-    base::DictionaryValue result;
-    callback.Run(DBUS_METHOD_CALL_FAILURE, result);
-    return;
-  }
-  dbus::MessageReader reader(response);
-  scoped_ptr<base::Value> value(dbus::PopDataAsValue(&reader));
-  base::DictionaryValue* result = NULL;
-  if (!value.get() || !value->GetAsDictionary(&result)) {
-    base::DictionaryValue result;
-    callback.Run(DBUS_METHOD_CALL_FAILURE, result);
-    return;
-  }
-  callback.Run(DBUS_METHOD_CALL_SUCCESS, *result);
-}
-
-}  // namespace chromeos