buffet: Extracted libweave into separate directory It still has references to dbus, buffet and other ChromeOS specific stuff. BUG=brillo:1235 TEST=FEATURES=test emerge-gizmo buffet Change-Id: Ib108960ee88afcf2ecdddf37ce30bd5f168c0034 Reviewed-on: https://chromium-review.googlesource.com/283509 Tested-by: Vitaly Buka <vitalybuka@chromium.org> Reviewed-by: Alex Vakulenko <avakulenko@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/buffet/buffet.gyp b/buffet/buffet.gyp index f8c0a5a..7b92439 100644 --- a/buffet/buffet.gyp +++ b/buffet/buffet.gyp
@@ -10,7 +10,11 @@ 'system_api', ], }, - 'include_dirs': ['.'], + 'include_dirs': [ + '.', + # TODO(vitalybuka): Remove both. + '../libweave/include', + ], }, 'targets': [ { @@ -21,53 +25,53 @@ 'dbus_service_config': 'dbus_bindings/dbus-service-config.json', }, 'sources': [ - 'base_api_handler.cc', - 'buffet_config.cc', - 'commands/command_definition.cc', - 'commands/command_dictionary.cc', - 'commands/command_instance.cc', - 'commands/command_manager.cc', - 'commands/command_queue.cc', - 'commands/dbus_command_dispatcher.cc', - 'commands/dbus_command_proxy.cc', - 'commands/cloud_command_proxy.cc', - 'commands/object_schema.cc', - 'commands/prop_constraints.cc', - 'commands/prop_types.cc', - 'commands/prop_values.cc', - 'commands/schema_constants.cc', - 'commands/schema_utils.cc', - 'commands/user_role.cc', - 'device_registration_info.cc', 'dbus_bindings/org.chromium.Buffet.Command.xml', 'dbus_bindings/org.chromium.Buffet.Manager.xml', 'dbus_constants.cc', 'manager.cc', - 'notification/notification_parser.cc', - 'notification/pull_channel.cc', - 'notification/xml_node.cc', - 'notification/xmpp_channel.cc', - 'notification/xmpp_iq_stanza_handler.cc', - 'notification/xmpp_stream_parser.cc', - 'privet/ap_manager_client.cc', - 'privet/cloud_delegate.cc', - 'privet/constants.cc', - 'privet/device_delegate.cc', - 'privet/openssl_utils.cc', - 'privet/peerd_client.cc', - 'privet/privet_handler.cc', - 'privet/privet_manager.cc', - 'privet/security_manager.cc', - 'privet/shill_client.cc', - 'privet/wifi_bootstrap_manager.cc', - 'privet/wifi_ssid_generator.cc', - 'registration_status.cc', - 'storage_impls.cc', - 'states/error_codes.cc', - 'states/state_change_queue.cc', - 'states/state_manager.cc', - 'states/state_package.cc', - 'utils.cc', + '../libweave/src/base_api_handler.cc', + '../libweave/src/buffet_config.cc', + '../libweave/src/commands/cloud_command_proxy.cc', + '../libweave/src/commands/command_definition.cc', + '../libweave/src/commands/command_dictionary.cc', + '../libweave/src/commands/command_instance.cc', + '../libweave/src/commands/command_manager.cc', + '../libweave/src/commands/command_queue.cc', + '../libweave/src/commands/dbus_command_dispatcher.cc', + '../libweave/src/commands/dbus_command_proxy.cc', + '../libweave/src/commands/object_schema.cc', + '../libweave/src/commands/prop_constraints.cc', + '../libweave/src/commands/prop_types.cc', + '../libweave/src/commands/prop_values.cc', + '../libweave/src/commands/schema_constants.cc', + '../libweave/src/commands/schema_utils.cc', + '../libweave/src/commands/user_role.cc', + '../libweave/src/device_registration_info.cc', + '../libweave/src/notification/notification_parser.cc', + '../libweave/src/notification/pull_channel.cc', + '../libweave/src/notification/xml_node.cc', + '../libweave/src/notification/xmpp_channel.cc', + '../libweave/src/notification/xmpp_iq_stanza_handler.cc', + '../libweave/src/notification/xmpp_stream_parser.cc', + '../libweave/src/privet/ap_manager_client.cc', + '../libweave/src/privet/cloud_delegate.cc', + '../libweave/src/privet/constants.cc', + '../libweave/src/privet/device_delegate.cc', + '../libweave/src/privet/openssl_utils.cc', + '../libweave/src/privet/peerd_client.cc', + '../libweave/src/privet/privet_handler.cc', + '../libweave/src/privet/privet_manager.cc', + '../libweave/src/privet/security_manager.cc', + '../libweave/src/privet/shill_client.cc', + '../libweave/src/privet/wifi_bootstrap_manager.cc', + '../libweave/src/privet/wifi_ssid_generator.cc', + '../libweave/src/registration_status.cc', + '../libweave/src/states/error_codes.cc', + '../libweave/src/states/state_change_queue.cc', + '../libweave/src/states/state_manager.cc', + '../libweave/src/states/state_package.cc', + '../libweave/src/storage_impls.cc', + '../libweave/src/utils.cc', ], 'includes': ['../common-mk/generate-dbus-adaptors.gypi'], 'actions': [ @@ -176,32 +180,32 @@ }, 'includes': ['../common-mk/common_test.gypi'], 'sources': [ - 'base_api_handler_unittest.cc', - 'buffet_testrunner.cc', - 'buffet_config_unittest.cc', - 'commands/cloud_command_proxy_unittest.cc', - 'commands/command_definition_unittest.cc', - 'commands/command_dictionary_unittest.cc', - 'commands/command_instance_unittest.cc', - 'commands/command_manager_unittest.cc', - 'commands/command_queue_unittest.cc', - 'commands/dbus_command_dispatcher_unittest.cc', - 'commands/dbus_command_proxy_unittest.cc', - 'commands/object_schema_unittest.cc', - 'commands/schema_utils_unittest.cc', - 'commands/unittest_utils.cc', - 'device_registration_info_unittest.cc', - 'notification/notification_parser_unittest.cc', - 'notification/xml_node_unittest.cc', - 'notification/xmpp_channel_unittest.cc', - 'notification/xmpp_iq_stanza_handler_unittest.cc', - 'notification/xmpp_stream_parser_unittest.cc', - 'privet/privet_handler_unittest.cc', - 'privet/security_manager_unittest.cc', - 'privet/wifi_ssid_generator_unittest.cc', - 'states/state_change_queue_unittest.cc', - 'states/state_manager_unittest.cc', - 'states/state_package_unittest.cc', + '../libweave/src/base_api_handler_unittest.cc', + '../libweave/src/buffet_config_unittest.cc', + '../libweave/src/buffet_testrunner.cc', + '../libweave/src/commands/cloud_command_proxy_unittest.cc', + '../libweave/src/commands/command_definition_unittest.cc', + '../libweave/src/commands/command_dictionary_unittest.cc', + '../libweave/src/commands/command_instance_unittest.cc', + '../libweave/src/commands/command_manager_unittest.cc', + '../libweave/src/commands/command_queue_unittest.cc', + '../libweave/src/commands/dbus_command_dispatcher_unittest.cc', + '../libweave/src/commands/dbus_command_proxy_unittest.cc', + '../libweave/src/commands/object_schema_unittest.cc', + '../libweave/src/commands/schema_utils_unittest.cc', + '../libweave/src/commands/unittest_utils.cc', + '../libweave/src/device_registration_info_unittest.cc', + '../libweave/src/notification/notification_parser_unittest.cc', + '../libweave/src/notification/xml_node_unittest.cc', + '../libweave/src/notification/xmpp_channel_unittest.cc', + '../libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc', + '../libweave/src/notification/xmpp_stream_parser_unittest.cc', + '../libweave/src/privet/privet_handler_unittest.cc', + '../libweave/src/privet/security_manager_unittest.cc', + '../libweave/src/privet/wifi_ssid_generator_unittest.cc', + '../libweave/src/states/state_change_queue_unittest.cc', + '../libweave/src/states/state_manager_unittest.cc', + '../libweave/src/states/state_package_unittest.cc', ], }, ],
diff --git a/buffet/manager.cc b/buffet/manager.cc index ca0f0ab..dd3b523 100644 --- a/buffet/manager.cc +++ b/buffet/manager.cc
@@ -23,16 +23,16 @@ #include <dbus/object_path.h> #include <dbus/values_util.h> -#include "buffet/base_api_handler.h" -#include "buffet/commands/command_instance.h" -#include "buffet/commands/schema_constants.h" -#include "buffet/privet/constants.h" -#include "buffet/privet/security_manager.h" -#include "buffet/privet/shill_client.h" -#include "buffet/privet/wifi_bootstrap_manager.h" -#include "buffet/states/state_change_queue.h" -#include "buffet/states/state_manager.h" -#include "buffet/storage_impls.h" +#include "libweave/src/base_api_handler.h" +#include "libweave/src/commands/command_instance.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/privet/constants.h" +#include "libweave/src/privet/security_manager.h" +#include "libweave/src/privet/shill_client.h" +#include "libweave/src/privet/wifi_bootstrap_manager.h" +#include "libweave/src/states/state_change_queue.h" +#include "libweave/src/states/state_manager.h" +#include "libweave/src/storage_impls.h" using chromeos::dbus_utils::AsyncEventSequencer; using chromeos::dbus_utils::ExportedObjectManager;
diff --git a/buffet/manager.h b/buffet/manager.h index 17613c4..5e9b25f 100644 --- a/buffet/manager.h +++ b/buffet/manager.h
@@ -19,11 +19,11 @@ #include <chromeos/dbus/exported_property_set.h> #include <chromeos/errors/error.h> -#include "buffet/commands/command_manager.h" -#include "buffet/device_registration_info.h" #include "buffet/org.chromium.Buffet.Manager.h" -#include "buffet/privet/privet_manager.h" -#include "buffet/privet/wifi_bootstrap_manager.h" +#include "libweave/src/commands/command_manager.h" +#include "libweave/src/device_registration_info.h" +#include "libweave/src/privet/privet_manager.h" +#include "libweave/src/privet/wifi_bootstrap_manager.h" namespace chromeos { namespace dbus_utils {
diff --git a/buffet/base_api_handler.cc b/libweave/src/base_api_handler.cc similarity index 93% rename from buffet/base_api_handler.cc rename to libweave/src/base_api_handler.cc index 16e9ec3..135dffa 100644 --- a/buffet/base_api_handler.cc +++ b/libweave/src/base_api_handler.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/base_api_handler.h" +#include "libweave/src/base_api_handler.h" -#include "buffet/commands/command_instance.h" -#include "buffet/commands/command_manager.h" -#include "buffet/device_registration_info.h" -#include "buffet/states/state_manager.h" +#include "libweave/src/commands/command_instance.h" +#include "libweave/src/commands/command_manager.h" +#include "libweave/src/device_registration_info.h" +#include "libweave/src/states/state_manager.h" namespace buffet {
diff --git a/buffet/base_api_handler.h b/libweave/src/base_api_handler.h similarity index 90% rename from buffet/base_api_handler.h rename to libweave/src/base_api_handler.h index 9c9bcb0..73c0980 100644 --- a/buffet/base_api_handler.h +++ b/libweave/src/base_api_handler.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_BASE_API_HANDLER_H_ -#define BUFFET_BASE_API_HANDLER_H_ +#ifndef LIBWEAVE_SRC_BASE_API_HANDLER_H_ +#define LIBWEAVE_SRC_BASE_API_HANDLER_H_ #include <memory> #include <string> @@ -43,4 +43,4 @@ } // namespace buffet -#endif // BUFFET_BASE_API_HANDLER_H_ +#endif // LIBWEAVE_SRC_BASE_API_HANDLER_H_
diff --git a/buffet/base_api_handler_unittest.cc b/libweave/src/base_api_handler_unittest.cc similarity index 93% rename from buffet/base_api_handler_unittest.cc rename to libweave/src/base_api_handler_unittest.cc index c7df9bb..a79abe0 100644 --- a/buffet/base_api_handler_unittest.cc +++ b/libweave/src/base_api_handler_unittest.cc
@@ -2,20 +2,20 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/base_api_handler.h" +#include "libweave/src/base_api_handler.h" #include <base/strings/string_number_conversions.h> #include <base/values.h> #include <chromeos/http/http_transport_fake.h> #include <gtest/gtest.h> -#include "buffet/buffet_config.h" -#include "buffet/commands/command_manager.h" -#include "buffet/commands/unittest_utils.h" -#include "buffet/device_registration_info.h" -#include "buffet/states/mock_state_change_queue_interface.h" -#include "buffet/states/state_manager.h" -#include "buffet/storage_impls.h" +#include "libweave/src/buffet_config.h" +#include "libweave/src/commands/command_manager.h" +#include "libweave/src/commands/unittest_utils.h" +#include "libweave/src/device_registration_info.h" +#include "libweave/src/states/mock_state_change_queue_interface.h" +#include "libweave/src/states/state_manager.h" +#include "libweave/src/storage_impls.h" namespace buffet {
diff --git a/buffet/buffet_config.cc b/libweave/src/buffet_config.cc similarity index 98% rename from buffet/buffet_config.cc rename to libweave/src/buffet_config.cc index 72f8338..854b0c2 100644 --- a/buffet/buffet_config.cc +++ b/libweave/src/buffet_config.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/buffet_config.h" +#include "libweave/src/buffet_config.h" #include <set> @@ -11,8 +11,8 @@ #include <base/strings/string_number_conversions.h> #include <chromeos/strings/string_utils.h> -#include "buffet/storage_impls.h" -#include "buffet/storage_interface.h" +#include "libweave/src/storage_impls.h" +#include "libweave/src/storage_interface.h" namespace {
diff --git a/buffet/buffet_config.h b/libweave/src/buffet_config.h similarity index 96% rename from buffet/buffet_config.h rename to libweave/src/buffet_config.h index a2b25d9..73ed04f 100644 --- a/buffet/buffet_config.h +++ b/libweave/src/buffet_config.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_BUFFET_CONFIG_H_ -#define BUFFET_BUFFET_CONFIG_H_ +#ifndef LIBWEAVE_SRC_BUFFET_CONFIG_H_ +#define LIBWEAVE_SRC_BUFFET_CONFIG_H_ #include <set> #include <string> @@ -14,7 +14,7 @@ #include <chromeos/errors/error.h> #include <chromeos/key_value_store.h> -#include "buffet/privet/security_delegate.h" +#include "libweave/src/privet/security_delegate.h" namespace buffet { @@ -171,4 +171,4 @@ } // namespace buffet -#endif // BUFFET_BUFFET_CONFIG_H_ +#endif // LIBWEAVE_SRC_BUFFET_CONFIG_H_
diff --git a/buffet/buffet_config_unittest.cc b/libweave/src/buffet_config_unittest.cc similarity index 98% rename from buffet/buffet_config_unittest.cc rename to libweave/src/buffet_config_unittest.cc index 7fa1933..5274c5a 100644 --- a/buffet/buffet_config_unittest.cc +++ b/libweave/src/buffet_config_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/buffet_config.h" +#include "libweave/src/buffet_config.h" #include <set> @@ -10,8 +10,8 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/commands/unittest_utils.h" -#include "buffet/storage_impls.h" +#include "libweave/src/commands/unittest_utils.h" +#include "libweave/src/storage_impls.h" using testing::_;
diff --git a/buffet/buffet_testrunner.cc b/libweave/src/buffet_testrunner.cc similarity index 100% rename from buffet/buffet_testrunner.cc rename to libweave/src/buffet_testrunner.cc
diff --git a/buffet/commands/cloud_command_proxy.cc b/libweave/src/commands/cloud_command_proxy.cc similarity index 95% rename from buffet/commands/cloud_command_proxy.cc rename to libweave/src/commands/cloud_command_proxy.cc index 127e63b..7f9afcc 100644 --- a/buffet/commands/cloud_command_proxy.cc +++ b/libweave/src/commands/cloud_command_proxy.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/cloud_command_proxy.h" +#include "libweave/src/commands/cloud_command_proxy.h" #include <base/bind.h> -#include "buffet/commands/command_instance.h" -#include "buffet/commands/prop_constraints.h" -#include "buffet/commands/prop_types.h" -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/command_instance.h" +#include "libweave/src/commands/prop_constraints.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/cloud_command_proxy.h b/libweave/src/commands/cloud_command_proxy.h similarity index 90% rename from buffet/commands/cloud_command_proxy.h rename to libweave/src/commands/cloud_command_proxy.h index 55eb552..3d47e9d 100644 --- a/buffet/commands/cloud_command_proxy.h +++ b/libweave/src/commands/cloud_command_proxy.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_CLOUD_COMMAND_PROXY_H_ -#define BUFFET_COMMANDS_CLOUD_COMMAND_PROXY_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_CLOUD_COMMAND_PROXY_H_ +#define LIBWEAVE_SRC_COMMANDS_CLOUD_COMMAND_PROXY_H_ #include <deque> #include <memory> @@ -16,9 +16,9 @@ #include <base/task_runner.h> #include <chromeos/backoff_entry.h> -#include "buffet/commands/cloud_command_update_interface.h" -#include "buffet/commands/command_proxy_interface.h" -#include "buffet/states/state_change_queue_interface.h" +#include "libweave/src/commands/cloud_command_update_interface.h" +#include "libweave/src/commands/command_proxy_interface.h" +#include "libweave/src/states/state_change_queue_interface.h" namespace buffet { @@ -96,4 +96,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_CLOUD_COMMAND_PROXY_H_ +#endif // LIBWEAVE_SRC_COMMANDS_CLOUD_COMMAND_PROXY_H_
diff --git a/buffet/commands/cloud_command_proxy_unittest.cc b/libweave/src/commands/cloud_command_proxy_unittest.cc similarity index 97% rename from buffet/commands/cloud_command_proxy_unittest.cc rename to libweave/src/commands/cloud_command_proxy_unittest.cc index 0f0d19c..518d45f 100644 --- a/buffet/commands/cloud_command_proxy_unittest.cc +++ b/libweave/src/commands/cloud_command_proxy_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/cloud_command_proxy.h" +#include "libweave/src/commands/cloud_command_proxy.h" #include <memory> #include <queue> @@ -11,10 +11,10 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/commands/command_dictionary.h" -#include "buffet/commands/command_instance.h" -#include "buffet/commands/unittest_utils.h" -#include "buffet/states/mock_state_change_queue_interface.h" +#include "libweave/src/commands/command_dictionary.h" +#include "libweave/src/commands/command_instance.h" +#include "libweave/src/commands/unittest_utils.h" +#include "libweave/src/states/mock_state_change_queue_interface.h" using testing::SaveArg; using testing::Invoke;
diff --git a/buffet/commands/cloud_command_update_interface.h b/libweave/src/commands/cloud_command_update_interface.h similarity index 79% rename from buffet/commands/cloud_command_update_interface.h rename to libweave/src/commands/cloud_command_update_interface.h index d18ec85..4778db4 100644 --- a/buffet/commands/cloud_command_update_interface.h +++ b/libweave/src/commands/cloud_command_update_interface.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_CLOUD_COMMAND_UPDATE_INTERFACE_H_ -#define BUFFET_COMMANDS_CLOUD_COMMAND_UPDATE_INTERFACE_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_CLOUD_COMMAND_UPDATE_INTERFACE_H_ +#define LIBWEAVE_SRC_COMMANDS_CLOUD_COMMAND_UPDATE_INTERFACE_H_ #include <string> @@ -27,4 +27,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_CLOUD_COMMAND_UPDATE_INTERFACE_H_ +#endif // LIBWEAVE_SRC_COMMANDS_CLOUD_COMMAND_UPDATE_INTERFACE_H_
diff --git a/buffet/commands/command_definition.cc b/libweave/src/commands/command_definition.cc similarity index 95% rename from buffet/commands/command_definition.cc rename to libweave/src/commands/command_definition.cc index 260cb3d..4dfa51e 100644 --- a/buffet/commands/command_definition.cc +++ b/libweave/src/commands/command_definition.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_definition.h" +#include "libweave/src/commands/command_definition.h" #include <vector> #include <chromeos/errors/error.h> #include <chromeos/strings/string_utils.h> -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/command_definition.h b/libweave/src/commands/command_definition.h similarity index 92% rename from buffet/commands/command_definition.h rename to libweave/src/commands/command_definition.h index ea8e5e6..55dcae6 100644 --- a/buffet/commands/command_definition.h +++ b/libweave/src/commands/command_definition.h
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_COMMAND_DEFINITION_H_ -#define BUFFET_COMMANDS_COMMAND_DEFINITION_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_COMMAND_DEFINITION_H_ +#define LIBWEAVE_SRC_COMMANDS_COMMAND_DEFINITION_H_ #include <memory> #include <string> #include <base/macros.h> -#include "buffet/commands/object_schema.h" -#include "buffet/commands/user_role.h" +#include "libweave/src/commands/object_schema.h" +#include "libweave/src/commands/user_role.h" namespace buffet { @@ -81,4 +81,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_COMMAND_DEFINITION_H_ +#endif // LIBWEAVE_SRC_COMMANDS_COMMAND_DEFINITION_H_
diff --git a/buffet/commands/command_definition_unittest.cc b/libweave/src/commands/command_definition_unittest.cc similarity index 97% rename from buffet/commands/command_definition_unittest.cc rename to libweave/src/commands/command_definition_unittest.cc index e422324..bd1835f 100644 --- a/buffet/commands/command_definition_unittest.cc +++ b/libweave/src/commands/command_definition_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_definition.h" +#include "libweave/src/commands/command_definition.h" #include <gtest/gtest.h>
diff --git a/buffet/commands/command_dictionary.cc b/libweave/src/commands/command_dictionary.cc similarity index 98% rename from buffet/commands/command_dictionary.cc rename to libweave/src/commands/command_dictionary.cc index 2de0f36..f8103be 100644 --- a/buffet/commands/command_dictionary.cc +++ b/libweave/src/commands/command_dictionary.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_dictionary.h" +#include "libweave/src/commands/command_dictionary.h" #include <base/values.h> #include <chromeos/strings/string_utils.h> -#include "buffet/commands/command_definition.h" -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/command_definition.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/command_dictionary.h b/libweave/src/commands/command_dictionary.h similarity index 94% rename from buffet/commands/command_dictionary.h rename to libweave/src/commands/command_dictionary.h index 97ab596..e800c4f 100644 --- a/buffet/commands/command_dictionary.h +++ b/libweave/src/commands/command_dictionary.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_COMMAND_DICTIONARY_H_ -#define BUFFET_COMMANDS_COMMAND_DICTIONARY_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_COMMAND_DICTIONARY_H_ +#define LIBWEAVE_SRC_COMMANDS_COMMAND_DICTIONARY_H_ #include <map> #include <memory> @@ -14,7 +14,7 @@ #include <base/macros.h> #include <chromeos/errors/error.h> -#include "buffet/commands/command_definition.h" +#include "libweave/src/commands/command_definition.h" namespace base { class Value; @@ -96,4 +96,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_COMMAND_DICTIONARY_H_ +#endif // LIBWEAVE_SRC_COMMANDS_COMMAND_DICTIONARY_H_
diff --git a/buffet/commands/command_dictionary_unittest.cc b/libweave/src/commands/command_dictionary_unittest.cc similarity index 99% rename from buffet/commands/command_dictionary_unittest.cc rename to libweave/src/commands/command_dictionary_unittest.cc index 7b649a5..45aa59b 100644 --- a/buffet/commands/command_dictionary_unittest.cc +++ b/libweave/src/commands/command_dictionary_unittest.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_dictionary.h" +#include "libweave/src/commands/command_dictionary.h" #include <gtest/gtest.h> -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/commands/command_instance.cc b/libweave/src/commands/command_instance.cc similarity index 94% rename from buffet/commands/command_instance.cc rename to libweave/src/commands/command_instance.cc index a2e098f..ed28687 100644 --- a/buffet/commands/command_instance.cc +++ b/libweave/src/commands/command_instance.cc
@@ -2,19 +2,19 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_instance.h" +#include "libweave/src/commands/command_instance.h" #include <base/values.h> #include <chromeos/errors/error.h> #include <chromeos/errors/error_codes.h> -#include "buffet/commands/command_definition.h" -#include "buffet/commands/command_dictionary.h" -#include "buffet/commands/command_proxy_interface.h" -#include "buffet/commands/command_queue.h" -#include "buffet/commands/prop_types.h" -#include "buffet/commands/schema_constants.h" -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/command_definition.h" +#include "libweave/src/commands/command_dictionary.h" +#include "libweave/src/commands/command_proxy_interface.h" +#include "libweave/src/commands/command_queue.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/commands/schema_utils.h" namespace buffet {
diff --git a/buffet/commands/command_instance.h b/libweave/src/commands/command_instance.h similarity index 95% rename from buffet/commands/command_instance.h rename to libweave/src/commands/command_instance.h index 6ce7036..85e78eb 100644 --- a/buffet/commands/command_instance.h +++ b/libweave/src/commands/command_instance.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_COMMAND_INSTANCE_H_ -#define BUFFET_COMMANDS_COMMAND_INSTANCE_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_COMMAND_INSTANCE_H_ +#define LIBWEAVE_SRC_COMMANDS_COMMAND_INSTANCE_H_ #include <map> #include <memory> @@ -13,8 +13,8 @@ #include <base/macros.h> #include <chromeos/errors/error.h> -#include "buffet/commands/prop_values.h" -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/prop_values.h" +#include "libweave/src/commands/schema_utils.h" namespace base { class Value; @@ -153,4 +153,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_COMMAND_INSTANCE_H_ +#endif // LIBWEAVE_SRC_COMMANDS_COMMAND_INSTANCE_H_
diff --git a/buffet/commands/command_instance_unittest.cc b/libweave/src/commands/command_instance_unittest.cc similarity index 96% rename from buffet/commands/command_instance_unittest.cc rename to libweave/src/commands/command_instance_unittest.cc index f7744b0..53fe646 100644 --- a/buffet/commands/command_instance_unittest.cc +++ b/libweave/src/commands/command_instance_unittest.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_instance.h" +#include "libweave/src/commands/command_instance.h" #include <gtest/gtest.h> -#include "buffet/commands/command_dictionary.h" -#include "buffet/commands/prop_types.h" -#include "buffet/commands/schema_utils.h" -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/command_dictionary.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/schema_utils.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/commands/command_manager.cc b/libweave/src/commands/command_manager.cc similarity index 97% rename from buffet/commands/command_manager.cc rename to libweave/src/commands/command_manager.cc index 71ea5a9..e636837 100644 --- a/buffet/commands/command_manager.cc +++ b/libweave/src/commands/command_manager.cc
@@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_manager.h" +#include "libweave/src/commands/command_manager.h" #include <base/files/file_enumerator.h> #include <base/values.h> #include <chromeos/dbus/exported_object_manager.h> #include <chromeos/errors/error.h> -#include "buffet/commands/schema_constants.h" -#include "buffet/utils.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/utils.h" using chromeos::dbus_utils::ExportedObjectManager;
diff --git a/buffet/commands/command_manager.h b/libweave/src/commands/command_manager.h similarity index 93% rename from buffet/commands/command_manager.h rename to libweave/src/commands/command_manager.h index 3c2f720..6a6b6dc 100644 --- a/buffet/commands/command_manager.h +++ b/libweave/src/commands/command_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_COMMAND_MANAGER_H_ -#define BUFFET_COMMANDS_COMMAND_MANAGER_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_COMMAND_MANAGER_H_ +#define LIBWEAVE_SRC_COMMANDS_COMMAND_MANAGER_H_ #include <memory> #include <string> @@ -14,9 +14,9 @@ #include <base/macros.h> #include <base/memory/weak_ptr.h> -#include "buffet/commands/command_dictionary.h" -#include "buffet/commands/command_queue.h" -#include "buffet/commands/dbus_command_dispatcher.h" +#include "libweave/src/commands/command_dictionary.h" +#include "libweave/src/commands/command_queue.h" +#include "libweave/src/commands/dbus_command_dispatcher.h" namespace chromeos { namespace dbus_utils { @@ -122,4 +122,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_COMMAND_MANAGER_H_ +#endif // LIBWEAVE_SRC_COMMANDS_COMMAND_MANAGER_H_
diff --git a/buffet/commands/command_manager_unittest.cc b/libweave/src/commands/command_manager_unittest.cc similarity index 98% rename from buffet/commands/command_manager_unittest.cc rename to libweave/src/commands/command_manager_unittest.cc index 81c2a5b..da37057 100644 --- a/buffet/commands/command_manager_unittest.cc +++ b/libweave/src/commands/command_manager_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_manager.h" +#include "libweave/src/commands/command_manager.h" #include <base/files/file_util.h> #include <base/files/scoped_temp_dir.h> @@ -10,7 +10,7 @@ #include <chromeos/bind_lambda.h> #include <gtest/gtest.h> -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/commands/command_proxy_interface.h b/libweave/src/commands/command_proxy_interface.h similarity index 74% rename from buffet/commands/command_proxy_interface.h rename to libweave/src/commands/command_proxy_interface.h index 0b5981c..53faa60 100644 --- a/buffet/commands/command_proxy_interface.h +++ b/libweave/src/commands/command_proxy_interface.h
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_COMMAND_PROXY_INTERFACE_H_ -#define BUFFET_COMMANDS_COMMAND_PROXY_INTERFACE_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_COMMAND_PROXY_INTERFACE_H_ +#define LIBWEAVE_SRC_COMMANDS_COMMAND_PROXY_INTERFACE_H_ #include <string> -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/schema_utils.h" namespace buffet { @@ -25,4 +25,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_COMMAND_PROXY_INTERFACE_H_ +#endif // LIBWEAVE_SRC_COMMANDS_COMMAND_PROXY_INTERFACE_H_
diff --git a/buffet/commands/command_queue.cc b/libweave/src/commands/command_queue.cc similarity index 97% rename from buffet/commands/command_queue.cc rename to libweave/src/commands/command_queue.cc index f4cda60..904cf8e 100644 --- a/buffet/commands/command_queue.cc +++ b/libweave/src/commands/command_queue.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_queue.h" +#include "libweave/src/commands/command_queue.h" #include <base/bind.h> #include <base/time/time.h>
diff --git a/buffet/commands/command_queue.h b/libweave/src/commands/command_queue.h similarity index 92% rename from buffet/commands/command_queue.h rename to libweave/src/commands/command_queue.h index db6707c..8d43cc9 100644 --- a/buffet/commands/command_queue.h +++ b/libweave/src/commands/command_queue.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_COMMAND_QUEUE_H_ -#define BUFFET_COMMANDS_COMMAND_QUEUE_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_COMMAND_QUEUE_H_ +#define LIBWEAVE_SRC_COMMANDS_COMMAND_QUEUE_H_ #include <map> #include <memory> @@ -15,7 +15,7 @@ #include <base/callback.h> #include <base/macros.h> -#include "buffet/commands/command_instance.h" +#include "libweave/src/commands/command_instance.h" namespace buffet { @@ -84,4 +84,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_COMMAND_QUEUE_H_ +#endif // LIBWEAVE_SRC_COMMANDS_COMMAND_QUEUE_H_
diff --git a/buffet/commands/command_queue_unittest.cc b/libweave/src/commands/command_queue_unittest.cc similarity index 96% rename from buffet/commands/command_queue_unittest.cc rename to libweave/src/commands/command_queue_unittest.cc index f29b03e..662cf82 100644 --- a/buffet/commands/command_queue_unittest.cc +++ b/libweave/src/commands/command_queue_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/command_queue.h" +#include "libweave/src/commands/command_queue.h" #include <set> #include <string> @@ -13,8 +13,8 @@ #include <chromeos/strings/string_utils.h> #include <gtest/gtest.h> -#include "buffet/commands/command_definition.h" -#include "buffet/commands/object_schema.h" +#include "libweave/src/commands/command_definition.h" +#include "libweave/src/commands/object_schema.h" namespace buffet {
diff --git a/buffet/commands/dbus_command_dispatcher.cc b/libweave/src/commands/dbus_command_dispatcher.cc similarity index 85% rename from buffet/commands/dbus_command_dispatcher.cc rename to libweave/src/commands/dbus_command_dispatcher.cc index 2f5333c..f832789 100644 --- a/buffet/commands/dbus_command_dispatcher.cc +++ b/libweave/src/commands/dbus_command_dispatcher.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/dbus_command_dispatcher.h" +#include "libweave/src/commands/dbus_command_dispatcher.h" #include <chromeos/dbus/exported_object_manager.h> -#include "buffet/commands/command_instance.h" -#include "buffet/commands/dbus_command_proxy.h" #include "buffet/dbus_constants.h" +#include "libweave/src/commands/command_instance.h" +#include "libweave/src/commands/dbus_command_proxy.h" using chromeos::dbus_utils::AsyncEventSequencer; using chromeos::dbus_utils::ExportedObjectManager;
diff --git a/buffet/commands/dbus_command_dispatcher.h b/libweave/src/commands/dbus_command_dispatcher.h similarity index 89% rename from buffet/commands/dbus_command_dispatcher.h rename to libweave/src/commands/dbus_command_dispatcher.h index e9f5003..4217582 100644 --- a/buffet/commands/dbus_command_dispatcher.h +++ b/libweave/src/commands/dbus_command_dispatcher.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_DBUS_COMMAND_DISPATCHER_H_ -#define BUFFET_COMMANDS_DBUS_COMMAND_DISPATCHER_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_DBUS_COMMAND_DISPATCHER_H_ +#define LIBWEAVE_SRC_COMMANDS_DBUS_COMMAND_DISPATCHER_H_ #include <map> #include <string> @@ -48,4 +48,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_DBUS_COMMAND_DISPATCHER_H_ +#endif // LIBWEAVE_SRC_COMMANDS_DBUS_COMMAND_DISPATCHER_H_
diff --git a/buffet/commands/dbus_command_dispatcher_unittest.cc b/libweave/src/commands/dbus_command_dispatcher_unittest.cc similarity index 96% rename from buffet/commands/dbus_command_dispatcher_unittest.cc rename to libweave/src/commands/dbus_command_dispatcher_unittest.cc index d9d91bc..00c2da1 100644 --- a/buffet/commands/dbus_command_dispatcher_unittest.cc +++ b/libweave/src/commands/dbus_command_dispatcher_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/dbus_command_dispatcher.h" +#include "libweave/src/commands/dbus_command_dispatcher.h" #include <memory> #include <string> @@ -14,11 +14,11 @@ #include <dbus/object_path.h> #include <gtest/gtest.h> -#include "buffet/commands/command_dictionary.h" -#include "buffet/commands/command_queue.h" -#include "buffet/commands/dbus_command_proxy.h" -#include "buffet/commands/unittest_utils.h" #include "buffet/dbus_constants.h" +#include "libweave/src/commands/command_dictionary.h" +#include "libweave/src/commands/command_queue.h" +#include "libweave/src/commands/dbus_command_proxy.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/commands/dbus_command_proxy.cc b/libweave/src/commands/dbus_command_proxy.cc similarity index 91% rename from buffet/commands/dbus_command_proxy.cc rename to libweave/src/commands/dbus_command_proxy.cc index 74278fe..1807a0e 100644 --- a/buffet/commands/dbus_command_proxy.cc +++ b/libweave/src/commands/dbus_command_proxy.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/dbus_command_proxy.h" +#include "libweave/src/commands/dbus_command_proxy.h" #include <chromeos/dbus/async_event_sequencer.h> #include <chromeos/dbus/exported_object_manager.h> -#include "buffet/commands/command_definition.h" -#include "buffet/commands/command_instance.h" -#include "buffet/commands/object_schema.h" -#include "buffet/commands/prop_constraints.h" -#include "buffet/commands/prop_types.h" +#include "libweave/src/commands/command_definition.h" +#include "libweave/src/commands/command_instance.h" +#include "libweave/src/commands/object_schema.h" +#include "libweave/src/commands/prop_constraints.h" +#include "libweave/src/commands/prop_types.h" using chromeos::dbus_utils::AsyncEventSequencer; using chromeos::dbus_utils::ExportedObjectManager;
diff --git a/buffet/commands/dbus_command_proxy.h b/libweave/src/commands/dbus_command_proxy.h similarity index 90% rename from buffet/commands/dbus_command_proxy.h rename to libweave/src/commands/dbus_command_proxy.h index aac671c..571c996 100644 --- a/buffet/commands/dbus_command_proxy.h +++ b/libweave/src/commands/dbus_command_proxy.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_DBUS_COMMAND_PROXY_H_ -#define BUFFET_COMMANDS_DBUS_COMMAND_PROXY_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_DBUS_COMMAND_PROXY_H_ +#define LIBWEAVE_SRC_COMMANDS_DBUS_COMMAND_PROXY_H_ #include <string> @@ -11,8 +11,8 @@ #include <chromeos/dbus/data_serialization.h> #include <chromeos/dbus/dbus_object.h> -#include "buffet/commands/command_proxy_interface.h" #include "buffet/org.chromium.Buffet.Command.h" +#include "libweave/src/commands/command_proxy_interface.h" namespace chromeos { namespace dbus_utils { @@ -67,4 +67,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_DBUS_COMMAND_PROXY_H_ +#endif // LIBWEAVE_SRC_COMMANDS_DBUS_COMMAND_PROXY_H_
diff --git a/buffet/commands/dbus_command_proxy_unittest.cc b/libweave/src/commands/dbus_command_proxy_unittest.cc similarity index 96% rename from buffet/commands/dbus_command_proxy_unittest.cc rename to libweave/src/commands/dbus_command_proxy_unittest.cc index 1f94ca7..c211166 100644 --- a/buffet/commands/dbus_command_proxy_unittest.cc +++ b/libweave/src/commands/dbus_command_proxy_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/dbus_command_proxy.h" +#include "libweave/src/commands/dbus_command_proxy.h" #include <functional> #include <memory> @@ -14,10 +14,10 @@ #include <chromeos/dbus/dbus_object_test_helpers.h> #include <gtest/gtest.h> -#include "buffet/commands/command_dictionary.h" -#include "buffet/commands/command_instance.h" -#include "buffet/commands/unittest_utils.h" #include "buffet/dbus_constants.h" +#include "libweave/src/commands/command_dictionary.h" +#include "libweave/src/commands/command_instance.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/commands/enum_to_string.h b/libweave/src/commands/enum_to_string.h similarity index 90% rename from buffet/commands/enum_to_string.h rename to libweave/src/commands/enum_to_string.h index 031c164..4c7d9aa 100644 --- a/buffet/commands/enum_to_string.h +++ b/libweave/src/commands/enum_to_string.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_ENUM_TO_STRING_H_ -#define BUFFET_COMMANDS_ENUM_TO_STRING_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_ENUM_TO_STRING_H_ +#define LIBWEAVE_SRC_COMMANDS_ENUM_TO_STRING_H_ #include <string> @@ -66,4 +66,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_ENUM_TO_STRING_H_ +#endif // LIBWEAVE_SRC_COMMANDS_ENUM_TO_STRING_H_
diff --git a/buffet/commands/object_schema.cc b/libweave/src/commands/object_schema.cc similarity index 98% rename from buffet/commands/object_schema.cc rename to libweave/src/commands/object_schema.cc index 6838794..0fcf3ac 100644 --- a/buffet/commands/object_schema.cc +++ b/libweave/src/commands/object_schema.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/object_schema.h" +#include "libweave/src/commands/object_schema.h" #include <algorithm> #include <limits> @@ -11,9 +11,9 @@ #include <base/values.h> #include <chromeos/map_utils.h> -#include "buffet/commands/prop_types.h" -#include "buffet/commands/prop_values.h" -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/prop_values.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/object_schema.h b/libweave/src/commands/object_schema.h similarity index 95% rename from buffet/commands/object_schema.h rename to libweave/src/commands/object_schema.h index 1f272e6..4add1c7 100644 --- a/buffet/commands/object_schema.h +++ b/libweave/src/commands/object_schema.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_OBJECT_SCHEMA_H_ -#define BUFFET_COMMANDS_OBJECT_SCHEMA_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_OBJECT_SCHEMA_H_ +#define LIBWEAVE_SRC_COMMANDS_OBJECT_SCHEMA_H_ #include <map> #include <memory> @@ -87,4 +87,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_OBJECT_SCHEMA_H_ +#endif // LIBWEAVE_SRC_COMMANDS_OBJECT_SCHEMA_H_
diff --git a/buffet/commands/object_schema_unittest.cc b/libweave/src/commands/object_schema_unittest.cc similarity index 99% rename from buffet/commands/object_schema_unittest.cc rename to libweave/src/commands/object_schema_unittest.cc index 1330099..04ca232 100644 --- a/buffet/commands/object_schema_unittest.cc +++ b/libweave/src/commands/object_schema_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/object_schema.h" +#include "libweave/src/commands/object_schema.h" #include <algorithm> #include <limits> @@ -14,10 +14,10 @@ #include <base/values.h> #include <gtest/gtest.h> -#include "buffet/commands/prop_constraints.h" -#include "buffet/commands/prop_types.h" -#include "buffet/commands/schema_constants.h" -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/prop_constraints.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/commands/prop_constraints.cc b/libweave/src/commands/prop_constraints.cc similarity index 97% rename from buffet/commands/prop_constraints.cc rename to libweave/src/commands/prop_constraints.cc index 1fd43e6..c8f78e4 100644 --- a/buffet/commands/prop_constraints.cc +++ b/libweave/src/commands/prop_constraints.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/prop_constraints.h" +#include "libweave/src/commands/prop_constraints.h" #include <base/json/json_writer.h> -#include "buffet/commands/prop_values.h" -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/prop_values.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/prop_constraints.h b/libweave/src/commands/prop_constraints.h similarity index 97% rename from buffet/commands/prop_constraints.h rename to libweave/src/commands/prop_constraints.h index c6b7e9b..ccfaaf0 100644 --- a/buffet/commands/prop_constraints.h +++ b/libweave/src/commands/prop_constraints.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_PROP_CONSTRAINTS_H_ -#define BUFFET_COMMANDS_PROP_CONSTRAINTS_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_PROP_CONSTRAINTS_H_ +#define LIBWEAVE_SRC_COMMANDS_PROP_CONSTRAINTS_H_ #include <string> #include <type_traits> @@ -14,9 +14,9 @@ #include <chromeos/errors/error.h> #include <chromeos/strings/string_utils.h> -#include "buffet/commands/prop_values.h" -#include "buffet/commands/schema_constants.h" -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/prop_values.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/commands/schema_utils.h" namespace buffet { @@ -337,4 +337,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_PROP_CONSTRAINTS_H_ +#endif // LIBWEAVE_SRC_COMMANDS_PROP_CONSTRAINTS_H_
diff --git a/buffet/commands/prop_types.cc b/libweave/src/commands/prop_types.cc similarity index 98% rename from buffet/commands/prop_types.cc rename to libweave/src/commands/prop_types.cc index f60f256..8da4260 100644 --- a/buffet/commands/prop_types.cc +++ b/libweave/src/commands/prop_types.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/prop_types.h" +#include "libweave/src/commands/prop_types.h" #include <algorithm> #include <limits> @@ -14,9 +14,9 @@ #include <chromeos/any.h> #include <chromeos/strings/string_utils.h> -#include "buffet/commands/object_schema.h" -#include "buffet/commands/prop_values.h" -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/object_schema.h" +#include "libweave/src/commands/prop_values.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/prop_types.h b/libweave/src/commands/prop_types.h similarity index 98% rename from buffet/commands/prop_types.h rename to libweave/src/commands/prop_types.h index 4841db6..1c31d04 100644 --- a/buffet/commands/prop_types.h +++ b/libweave/src/commands/prop_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_PROP_TYPES_H_ -#define BUFFET_COMMANDS_PROP_TYPES_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_PROP_TYPES_H_ +#define LIBWEAVE_SRC_COMMANDS_PROP_TYPES_H_ #include <limits> #include <map> @@ -16,8 +16,8 @@ #include <chromeos/any.h> #include <chromeos/errors/error.h> -#include "buffet/commands/prop_constraints.h" -#include "buffet/commands/prop_values.h" +#include "libweave/src/commands/prop_constraints.h" +#include "libweave/src/commands/prop_values.h" namespace buffet { @@ -405,4 +405,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_PROP_TYPES_H_ +#endif // LIBWEAVE_SRC_COMMANDS_PROP_TYPES_H_
diff --git a/buffet/commands/prop_values.cc b/libweave/src/commands/prop_values.cc similarity index 81% rename from buffet/commands/prop_values.cc rename to libweave/src/commands/prop_values.cc index a4dc391..62a67be 100644 --- a/buffet/commands/prop_values.cc +++ b/libweave/src/commands/prop_values.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/prop_values.h" +#include "libweave/src/commands/prop_values.h" -#include "buffet/commands/prop_types.h" +#include "libweave/src/commands/prop_types.h" namespace buffet {
diff --git a/buffet/commands/prop_values.h b/libweave/src/commands/prop_values.h similarity index 97% rename from buffet/commands/prop_values.h rename to libweave/src/commands/prop_values.h index 228316f..5f46452 100644 --- a/buffet/commands/prop_values.h +++ b/libweave/src/commands/prop_values.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_PROP_VALUES_H_ -#define BUFFET_COMMANDS_PROP_VALUES_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_PROP_VALUES_H_ +#define LIBWEAVE_SRC_COMMANDS_PROP_VALUES_H_ #include <map> #include <memory> @@ -12,7 +12,7 @@ #include <chromeos/any.h> #include <chromeos/errors/error.h> -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/schema_utils.h" namespace base { class Value; @@ -222,4 +222,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_PROP_VALUES_H_ +#endif // LIBWEAVE_SRC_COMMANDS_PROP_VALUES_H_
diff --git a/buffet/commands/schema_constants.cc b/libweave/src/commands/schema_constants.cc similarity index 97% rename from buffet/commands/schema_constants.cc rename to libweave/src/commands/schema_constants.cc index 7af3a89..733c66d 100644 --- a/buffet/commands/schema_constants.cc +++ b/libweave/src/commands/schema_constants.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/schema_constants.h b/libweave/src/commands/schema_constants.h similarity index 93% rename from buffet/commands/schema_constants.h rename to libweave/src/commands/schema_constants.h index f9690fc..e00bae5 100644 --- a/buffet/commands/schema_constants.h +++ b/libweave/src/commands/schema_constants.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_SCHEMA_CONSTANTS_H_ -#define BUFFET_COMMANDS_SCHEMA_CONSTANTS_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_SCHEMA_CONSTANTS_H_ +#define LIBWEAVE_SRC_COMMANDS_SCHEMA_CONSTANTS_H_ namespace buffet { @@ -78,4 +78,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_SCHEMA_CONSTANTS_H_ +#endif // LIBWEAVE_SRC_COMMANDS_SCHEMA_CONSTANTS_H_
diff --git a/buffet/commands/schema_utils.cc b/libweave/src/commands/schema_utils.cc similarity index 98% rename from buffet/commands/schema_utils.cc rename to libweave/src/commands/schema_utils.cc index efb758e..c46bcbb 100644 --- a/buffet/commands/schema_utils.cc +++ b/libweave/src/commands/schema_utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/schema_utils.h" #include <algorithm> #include <set> @@ -10,9 +10,9 @@ #include <base/json/json_writer.h> -#include "buffet/commands/object_schema.h" -#include "buffet/commands/prop_types.h" -#include "buffet/commands/prop_values.h" +#include "libweave/src/commands/object_schema.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/prop_values.h" namespace buffet { namespace {
diff --git a/buffet/commands/schema_utils.h b/libweave/src/commands/schema_utils.h similarity index 97% rename from buffet/commands/schema_utils.h rename to libweave/src/commands/schema_utils.h index 59e3b39..8d02477 100644 --- a/buffet/commands/schema_utils.h +++ b/libweave/src/commands/schema_utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_SCHEMA_UTILS_H_ -#define BUFFET_COMMANDS_SCHEMA_UTILS_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_SCHEMA_UTILS_H_ +#define LIBWEAVE_SRC_COMMANDS_SCHEMA_UTILS_H_ #include <limits> #include <map> @@ -161,4 +161,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_SCHEMA_UTILS_H_ +#endif // LIBWEAVE_SRC_COMMANDS_SCHEMA_UTILS_H_
diff --git a/buffet/commands/schema_utils_unittest.cc b/libweave/src/commands/schema_utils_unittest.cc similarity index 97% rename from buffet/commands/schema_utils_unittest.cc rename to libweave/src/commands/schema_utils_unittest.cc index d872995..7e3debe 100644 --- a/buffet/commands/schema_utils_unittest.cc +++ b/libweave/src/commands/schema_utils_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/schema_utils.h" #include <memory> #include <string> @@ -12,11 +12,11 @@ #include <chromeos/variant_dictionary.h> #include <gtest/gtest.h> -#include "buffet/commands/object_schema.h" -#include "buffet/commands/prop_types.h" -#include "buffet/commands/prop_values.h" -#include "buffet/commands/schema_constants.h" -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/object_schema.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/prop_values.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/commands/unittest_utils.cc b/libweave/src/commands/unittest_utils.cc similarity index 95% rename from buffet/commands/unittest_utils.cc rename to libweave/src/commands/unittest_utils.cc index df07289..b5eb166 100644 --- a/buffet/commands/unittest_utils.cc +++ b/libweave/src/commands/unittest_utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/unittest_utils.h" #include <base/json/json_reader.h> #include <base/json/json_writer.h>
diff --git a/buffet/commands/unittest_utils.h b/libweave/src/commands/unittest_utils.h similarity index 88% rename from buffet/commands/unittest_utils.h rename to libweave/src/commands/unittest_utils.h index 3a9dcc1..b514204 100644 --- a/buffet/commands/unittest_utils.h +++ b/libweave/src/commands/unittest_utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_UNITTEST_UTILS_H_ -#define BUFFET_COMMANDS_UNITTEST_UTILS_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_UNITTEST_UTILS_H_ +#define LIBWEAVE_SRC_COMMANDS_UNITTEST_UTILS_H_ #include <memory> #include <string> @@ -11,8 +11,8 @@ #include <base/values.h> #include <gtest/gtest.h> -#include "buffet/commands/prop_types.h" -#include "buffet/commands/prop_values.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/prop_values.h" namespace buffet { namespace unittests { @@ -61,4 +61,4 @@ EXPECT_PRED2(buffet::unittests::IsEqualValue, \ *buffet::unittests::CreateValue(expected), actual) -#endif // BUFFET_COMMANDS_UNITTEST_UTILS_H_ +#endif // LIBWEAVE_SRC_COMMANDS_UNITTEST_UTILS_H_
diff --git a/buffet/commands/user_role.cc b/libweave/src/commands/user_role.cc similarity index 88% rename from buffet/commands/user_role.cc rename to libweave/src/commands/user_role.cc index a9237ee..b6f898d 100644 --- a/buffet/commands/user_role.cc +++ b/libweave/src/commands/user_role.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/commands/user_role.h" +#include "libweave/src/commands/user_role.h" #include <chromeos/errors/error.h> -#include "buffet/commands/enum_to_string.h" -#include "buffet/commands/schema_constants.h" +#include "libweave/src/commands/enum_to_string.h" +#include "libweave/src/commands/schema_constants.h" namespace buffet {
diff --git a/buffet/commands/user_role.h b/libweave/src/commands/user_role.h similarity index 78% rename from buffet/commands/user_role.h rename to libweave/src/commands/user_role.h index 711abdf..00dcf60 100644 --- a/buffet/commands/user_role.h +++ b/libweave/src/commands/user_role.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_COMMANDS_USER_ROLE_H_ -#define BUFFET_COMMANDS_USER_ROLE_H_ +#ifndef LIBWEAVE_SRC_COMMANDS_USER_ROLE_H_ +#define LIBWEAVE_SRC_COMMANDS_USER_ROLE_H_ #include <string> #include <chromeos/errors/error.h> @@ -25,4 +25,4 @@ } // namespace buffet -#endif // BUFFET_COMMANDS_USER_ROLE_H_ +#endif // LIBWEAVE_SRC_COMMANDS_USER_ROLE_H_
diff --git a/buffet/device_registration_info.cc b/libweave/src/device_registration_info.cc similarity index 98% rename from buffet/device_registration_info.cc rename to libweave/src/device_registration_info.cc index 66ee054..25ab205 100644 --- a/buffet/device_registration_info.cc +++ b/libweave/src/device_registration_info.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/device_registration_info.h" +#include "libweave/src/device_registration_info.h" #include <algorithm> #include <memory> @@ -22,13 +22,13 @@ #include <chromeos/strings/string_utils.h> #include <chromeos/url_utils.h> -#include "buffet/commands/cloud_command_proxy.h" -#include "buffet/commands/command_definition.h" -#include "buffet/commands/command_manager.h" -#include "buffet/commands/schema_constants.h" -#include "buffet/notification/xmpp_channel.h" -#include "buffet/states/state_manager.h" -#include "buffet/utils.h" +#include "libweave/src/commands/cloud_command_proxy.h" +#include "libweave/src/commands/command_definition.h" +#include "libweave/src/commands/command_manager.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/notification/xmpp_channel.h" +#include "libweave/src/states/state_manager.h" +#include "libweave/src/utils.h" const char buffet::kErrorDomainOAuth2[] = "oauth2"; const char buffet::kErrorDomainGCD[] = "gcd";
diff --git a/buffet/device_registration_info.h b/libweave/src/device_registration_info.h similarity index 95% rename from buffet/device_registration_info.h rename to libweave/src/device_registration_info.h index dcf54c0..56cae31 100644 --- a/buffet/device_registration_info.h +++ b/libweave/src/device_registration_info.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_DEVICE_REGISTRATION_INFO_H_ -#define BUFFET_DEVICE_REGISTRATION_INFO_H_ +#ifndef LIBWEAVE_SRC_DEVICE_REGISTRATION_INFO_H_ +#define LIBWEAVE_SRC_DEVICE_REGISTRATION_INFO_H_ #include <map> #include <memory> @@ -23,15 +23,15 @@ #include <chromeos/errors/error.h> #include <chromeos/http/http_transport.h> -#include "buffet/buffet_config.h" -#include "buffet/commands/cloud_command_update_interface.h" -#include "buffet/commands/command_manager.h" -#include "buffet/notification/notification_channel.h" -#include "buffet/notification/notification_delegate.h" -#include "buffet/notification/pull_channel.h" -#include "buffet/registration_status.h" -#include "buffet/states/state_change_queue_interface.h" -#include "buffet/storage_interface.h" +#include "libweave/src/buffet_config.h" +#include "libweave/src/commands/cloud_command_update_interface.h" +#include "libweave/src/commands/command_manager.h" +#include "libweave/src/notification/notification_channel.h" +#include "libweave/src/notification/notification_delegate.h" +#include "libweave/src/notification/pull_channel.h" +#include "libweave/src/registration_status.h" +#include "libweave/src/states/state_change_queue_interface.h" +#include "libweave/src/storage_interface.h" namespace base { class DictionaryValue; @@ -346,4 +346,4 @@ } // namespace buffet -#endif // BUFFET_DEVICE_REGISTRATION_INFO_H_ +#endif // LIBWEAVE_SRC_DEVICE_REGISTRATION_INFO_H_
diff --git a/buffet/device_registration_info_unittest.cc b/libweave/src/device_registration_info_unittest.cc similarity index 98% rename from buffet/device_registration_info_unittest.cc rename to libweave/src/device_registration_info_unittest.cc index 7a2a281..43bec4d 100644 --- a/buffet/device_registration_info_unittest.cc +++ b/libweave/src/device_registration_info_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/device_registration_info.h" +#include "libweave/src/device_registration_info.h" #include <base/json/json_reader.h> #include <base/json/json_writer.h> @@ -16,11 +16,11 @@ #include <chromeos/mime_utils.h> #include <gtest/gtest.h> -#include "buffet/commands/command_manager.h" -#include "buffet/commands/unittest_utils.h" -#include "buffet/states/mock_state_change_queue_interface.h" -#include "buffet/states/state_manager.h" -#include "buffet/storage_impls.h" +#include "libweave/src/commands/command_manager.h" +#include "libweave/src/commands/unittest_utils.h" +#include "libweave/src/states/mock_state_change_queue_interface.h" +#include "libweave/src/states/state_manager.h" +#include "libweave/src/storage_impls.h" namespace buffet {
diff --git a/buffet/notification/notification_channel.h b/libweave/src/notification/notification_channel.h similarity index 78% rename from buffet/notification/notification_channel.h rename to libweave/src/notification/notification_channel.h index 45267de..1c5bf06 100644 --- a/buffet/notification/notification_channel.h +++ b/libweave/src/notification/notification_channel.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_NOTIFICATION_CHANNEL_H_ -#define BUFFET_NOTIFICATION_NOTIFICATION_CHANNEL_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_CHANNEL_H_ +#define LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_CHANNEL_H_ #include <string> @@ -29,4 +29,4 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_NOTIFICATION_CHANNEL_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_CHANNEL_H_
diff --git a/buffet/notification/notification_delegate.h b/libweave/src/notification/notification_delegate.h similarity index 81% rename from buffet/notification/notification_delegate.h rename to libweave/src/notification/notification_delegate.h index 529e39d..4b66f31 100644 --- a/buffet/notification/notification_delegate.h +++ b/libweave/src/notification/notification_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_NOTIFICATION_DELEGATE_H_ -#define BUFFET_NOTIFICATION_NOTIFICATION_DELEGATE_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_DELEGATE_H_ +#define LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_DELEGATE_H_ #include <memory> #include <string> @@ -28,4 +28,4 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_NOTIFICATION_DELEGATE_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_DELEGATE_H_
diff --git a/buffet/notification/notification_parser.cc b/libweave/src/notification/notification_parser.cc similarity index 96% rename from buffet/notification/notification_parser.cc rename to libweave/src/notification/notification_parser.cc index 8cde3fa..4663050 100644 --- a/buffet/notification/notification_parser.cc +++ b/libweave/src/notification/notification_parser.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/notification_parser.h" +#include "libweave/src/notification/notification_parser.h" #include <base/logging.h>
diff --git a/buffet/notification/notification_parser.h b/libweave/src/notification/notification_parser.h similarity index 71% rename from buffet/notification/notification_parser.h rename to libweave/src/notification/notification_parser.h index eb50dc1..062ce4c 100644 --- a/buffet/notification/notification_parser.h +++ b/libweave/src/notification/notification_parser.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_NOTIFICATION_PARSER_H_ -#define BUFFET_NOTIFICATION_NOTIFICATION_PARSER_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_PARSER_H_ +#define LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_PARSER_H_ #include <string> #include <base/values.h> -#include "buffet/notification/notification_delegate.h" +#include "libweave/src/notification/notification_delegate.h" namespace buffet { @@ -21,4 +21,4 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_NOTIFICATION_PARSER_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_NOTIFICATION_PARSER_H_
diff --git a/buffet/notification/notification_parser_unittest.cc b/libweave/src/notification/notification_parser_unittest.cc similarity index 97% rename from buffet/notification/notification_parser_unittest.cc rename to libweave/src/notification/notification_parser_unittest.cc index d578b55..d60cde7 100644 --- a/buffet/notification/notification_parser_unittest.cc +++ b/libweave/src/notification/notification_parser_unittest.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/notification_parser.h" +#include "libweave/src/notification/notification_parser.h" #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/unittest_utils.h" using testing::SaveArg; using testing::Invoke;
diff --git a/buffet/notification/pull_channel.cc b/libweave/src/notification/pull_channel.cc similarity index 91% rename from buffet/notification/pull_channel.cc rename to libweave/src/notification/pull_channel.cc index 3172645..249c1e9 100644 --- a/buffet/notification/pull_channel.cc +++ b/libweave/src/notification/pull_channel.cc
@@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/pull_channel.h" +#include "libweave/src/notification/pull_channel.h" #include <base/bind.h> -#include "buffet/notification/notification_delegate.h" +#include "libweave/src/notification/notification_delegate.h" namespace buffet {
diff --git a/buffet/notification/pull_channel.h b/libweave/src/notification/pull_channel.h similarity index 84% rename from buffet/notification/pull_channel.h rename to libweave/src/notification/pull_channel.h index d1b993c..d1ff490 100644 --- a/buffet/notification/pull_channel.h +++ b/libweave/src/notification/pull_channel.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_PULL_CHANNEL_H_ -#define BUFFET_NOTIFICATION_PULL_CHANNEL_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_PULL_CHANNEL_H_ +#define LIBWEAVE_SRC_NOTIFICATION_PULL_CHANNEL_H_ #include <memory> #include <string> @@ -13,7 +13,7 @@ #include <base/single_thread_task_runner.h> #include <base/timer/timer.h> -#include "buffet/notification/notification_channel.h" +#include "libweave/src/notification/notification_channel.h" namespace buffet { @@ -45,4 +45,4 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_PULL_CHANNEL_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_PULL_CHANNEL_H_
diff --git a/buffet/notification/xml_node.cc b/libweave/src/notification/xml_node.cc similarity index 98% rename from buffet/notification/xml_node.cc rename to libweave/src/notification/xml_node.cc index f244c3a..692710e 100644 --- a/buffet/notification/xml_node.cc +++ b/libweave/src/notification/xml_node.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xml_node.h" +#include "libweave/src/notification/xml_node.h" #include <base/strings/stringprintf.h> #include <chromeos/strings/string_utils.h>
diff --git a/buffet/notification/xml_node.h b/libweave/src/notification/xml_node.h similarity index 97% rename from buffet/notification/xml_node.h rename to libweave/src/notification/xml_node.h index fc43650..3b68a13 100644 --- a/buffet/notification/xml_node.h +++ b/libweave/src/notification/xml_node.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_XML_NODE_H_ -#define BUFFET_NOTIFICATION_XML_NODE_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_XML_NODE_H_ +#define LIBWEAVE_SRC_NOTIFICATION_XML_NODE_H_ #include <map> #include <memory> @@ -120,5 +120,5 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_XML_NODE_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_XML_NODE_H_
diff --git a/buffet/notification/xml_node_unittest.cc b/libweave/src/notification/xml_node_unittest.cc similarity index 98% rename from buffet/notification/xml_node_unittest.cc rename to libweave/src/notification/xml_node_unittest.cc index 8b2ed5c..bd26364 100644 --- a/buffet/notification/xml_node_unittest.cc +++ b/libweave/src/notification/xml_node_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xml_node.h" +#include "libweave/src/notification/xml_node.h" #include <memory> #include <gtest/gtest.h> -#include "buffet/notification/xmpp_stream_parser.h" +#include "libweave/src/notification/xmpp_stream_parser.h" namespace buffet { namespace {
diff --git a/buffet/notification/xmpp_channel.cc b/libweave/src/notification/xmpp_channel.cc similarity index 97% rename from buffet/notification/xmpp_channel.cc rename to libweave/src/notification/xmpp_channel.cc index bf9e0b9..6c0a0e7 100644 --- a/buffet/notification/xmpp_channel.cc +++ b/libweave/src/notification/xmpp_channel.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xmpp_channel.h" +#include "libweave/src/notification/xmpp_channel.h" #include <string> @@ -12,11 +12,11 @@ #include <chromeos/streams/file_stream.h> #include <chromeos/streams/tls_stream.h> -#include "buffet/notification/notification_delegate.h" -#include "buffet/notification/notification_parser.h" -#include "buffet/notification/xml_node.h" -#include "buffet/privet/shill_client.h" -#include "buffet/utils.h" +#include "libweave/src/notification/notification_delegate.h" +#include "libweave/src/notification/notification_parser.h" +#include "libweave/src/notification/xml_node.h" +#include "libweave/src/privet/shill_client.h" +#include "libweave/src/utils.h" namespace buffet {
diff --git a/buffet/notification/xmpp_channel.h b/libweave/src/notification/xmpp_channel.h similarity index 93% rename from buffet/notification/xmpp_channel.h rename to libweave/src/notification/xmpp_channel.h index 3d279e4..ab09418 100644 --- a/buffet/notification/xmpp_channel.h +++ b/libweave/src/notification/xmpp_channel.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_XMPP_CHANNEL_H_ -#define BUFFET_NOTIFICATION_XMPP_CHANNEL_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_XMPP_CHANNEL_H_ +#define LIBWEAVE_SRC_NOTIFICATION_XMPP_CHANNEL_H_ #include <map> #include <memory> @@ -17,9 +17,9 @@ #include <chromeos/backoff_entry.h> #include <chromeos/streams/stream.h> -#include "buffet/notification/notification_channel.h" -#include "buffet/notification/xmpp_iq_stanza_handler.h" -#include "buffet/notification/xmpp_stream_parser.h" +#include "libweave/src/notification/notification_channel.h" +#include "libweave/src/notification/xmpp_iq_stanza_handler.h" +#include "libweave/src/notification/xmpp_stream_parser.h" namespace privetd { class ShillClient; @@ -169,5 +169,5 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_XMPP_CHANNEL_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_XMPP_CHANNEL_H_
diff --git a/buffet/notification/xmpp_channel_unittest.cc b/libweave/src/notification/xmpp_channel_unittest.cc similarity index 99% rename from buffet/notification/xmpp_channel_unittest.cc rename to libweave/src/notification/xmpp_channel_unittest.cc index 80a9af8..7f5acc0 100644 --- a/buffet/notification/xmpp_channel_unittest.cc +++ b/libweave/src/notification/xmpp_channel_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xmpp_channel.h" +#include "libweave/src/notification/xmpp_channel.h" #include <queue>
diff --git a/buffet/notification/xmpp_iq_stanza_handler.cc b/libweave/src/notification/xmpp_iq_stanza_handler.cc similarity index 96% rename from buffet/notification/xmpp_iq_stanza_handler.cc rename to libweave/src/notification/xmpp_iq_stanza_handler.cc index fada014..95d3cc0 100644 --- a/buffet/notification/xmpp_iq_stanza_handler.cc +++ b/libweave/src/notification/xmpp_iq_stanza_handler.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xmpp_iq_stanza_handler.h" +#include "libweave/src/notification/xmpp_iq_stanza_handler.h" #include <base/bind.h> #include <base/strings/string_number_conversions.h> #include <base/strings/stringprintf.h> -#include "buffet/notification/xml_node.h" -#include "buffet/notification/xmpp_channel.h" +#include "libweave/src/notification/xml_node.h" +#include "libweave/src/notification/xmpp_channel.h" namespace buffet {
diff --git a/buffet/notification/xmpp_iq_stanza_handler.h b/libweave/src/notification/xmpp_iq_stanza_handler.h similarity index 92% rename from buffet/notification/xmpp_iq_stanza_handler.h rename to libweave/src/notification/xmpp_iq_stanza_handler.h index 2583e90..4e80900 100644 --- a/buffet/notification/xmpp_iq_stanza_handler.h +++ b/libweave/src/notification/xmpp_iq_stanza_handler.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_XMPP_IQ_STANZA_HANDLER_H_ -#define BUFFET_NOTIFICATION_XMPP_IQ_STANZA_HANDLER_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_XMPP_IQ_STANZA_HANDLER_H_ +#define LIBWEAVE_SRC_NOTIFICATION_XMPP_IQ_STANZA_HANDLER_H_ #include <map> #include <memory> @@ -14,7 +14,7 @@ #include <base/memory/weak_ptr.h> #include <base/single_thread_task_runner.h> -#include "buffet/notification/xmpp_stream_parser.h" +#include "libweave/src/notification/xmpp_stream_parser.h" namespace buffet { @@ -78,5 +78,5 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_XMPP_IQ_STANZA_HANDLER_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_XMPP_IQ_STANZA_HANDLER_H_
diff --git a/buffet/notification/xmpp_iq_stanza_handler_unittest.cc b/libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc similarity index 96% rename from buffet/notification/xmpp_iq_stanza_handler_unittest.cc rename to libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc index 1e8be42..36cf691 100644 --- a/buffet/notification/xmpp_iq_stanza_handler_unittest.cc +++ b/libweave/src/notification/xmpp_iq_stanza_handler_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xmpp_iq_stanza_handler.h" +#include "libweave/src/notification/xmpp_iq_stanza_handler.h" #include <map> #include <memory> @@ -11,9 +11,9 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/notification/xml_node.h" -#include "buffet/notification/xmpp_channel.h" -#include "buffet/notification/xmpp_stream_parser.h" +#include "libweave/src/notification/xml_node.h" +#include "libweave/src/notification/xmpp_channel.h" +#include "libweave/src/notification/xmpp_stream_parser.h" using testing::Invoke; using testing::Return;
diff --git a/buffet/notification/xmpp_stream_parser.cc b/libweave/src/notification/xmpp_stream_parser.cc similarity index 96% rename from buffet/notification/xmpp_stream_parser.cc rename to libweave/src/notification/xmpp_stream_parser.cc index 02329d0..b7bc939 100644 --- a/buffet/notification/xmpp_stream_parser.cc +++ b/libweave/src/notification/xmpp_stream_parser.cc
@@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xmpp_stream_parser.h" +#include "libweave/src/notification/xmpp_stream_parser.h" -#include "buffet/notification/xml_node.h" +#include "libweave/src/notification/xml_node.h" namespace buffet {
diff --git a/buffet/notification/xmpp_stream_parser.h b/libweave/src/notification/xmpp_stream_parser.h similarity index 94% rename from buffet/notification/xmpp_stream_parser.h rename to libweave/src/notification/xmpp_stream_parser.h index 9ff9200..2a1c401 100644 --- a/buffet/notification/xmpp_stream_parser.h +++ b/libweave/src/notification/xmpp_stream_parser.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_NOTIFICATION_XMPP_STREAM_PARSER_H_ -#define BUFFET_NOTIFICATION_XMPP_STREAM_PARSER_H_ +#ifndef LIBWEAVE_SRC_NOTIFICATION_XMPP_STREAM_PARSER_H_ +#define LIBWEAVE_SRC_NOTIFICATION_XMPP_STREAM_PARSER_H_ #include <expat.h> @@ -85,5 +85,5 @@ } // namespace buffet -#endif // BUFFET_NOTIFICATION_XMPP_STREAM_PARSER_H_ +#endif // LIBWEAVE_SRC_NOTIFICATION_XMPP_STREAM_PARSER_H_
diff --git a/buffet/notification/xmpp_stream_parser_unittest.cc b/libweave/src/notification/xmpp_stream_parser_unittest.cc similarity index 98% rename from buffet/notification/xmpp_stream_parser_unittest.cc rename to libweave/src/notification/xmpp_stream_parser_unittest.cc index 578e6ad..33c5e55 100644 --- a/buffet/notification/xmpp_stream_parser_unittest.cc +++ b/libweave/src/notification/xmpp_stream_parser_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/notification/xmpp_stream_parser.h" +#include "libweave/src/notification/xmpp_stream_parser.h" #include <memory> #include <vector> #include <gtest/gtest.h> -#include "buffet/notification/xml_node.h" +#include "libweave/src/notification/xml_node.h" namespace buffet { namespace {
diff --git a/buffet/privet/ap_manager_client.cc b/libweave/src/privet/ap_manager_client.cc similarity index 98% rename from buffet/privet/ap_manager_client.cc rename to libweave/src/privet/ap_manager_client.cc index b123f1f..0b8630d 100644 --- a/buffet/privet/ap_manager_client.cc +++ b/libweave/src/privet/ap_manager_client.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/ap_manager_client.h" +#include "libweave/src/privet/ap_manager_client.h" namespace privetd {
diff --git a/buffet/privet/ap_manager_client.h b/libweave/src/privet/ap_manager_client.h similarity index 90% rename from buffet/privet/ap_manager_client.h rename to libweave/src/privet/ap_manager_client.h index ec99a6a..cbde4fc 100644 --- a/buffet/privet/ap_manager_client.h +++ b/libweave/src/privet/ap_manager_client.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_AP_MANAGER_CLIENT_H_ -#define BUFFET_PRIVET_AP_MANAGER_CLIENT_H_ +#ifndef LIBWEAVE_SRC_PRIVET_AP_MANAGER_CLIENT_H_ +#define LIBWEAVE_SRC_PRIVET_AP_MANAGER_CLIENT_H_ #include <memory> #include <string> @@ -54,4 +54,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_AP_MANAGER_CLIENT_H_ +#endif // LIBWEAVE_SRC_PRIVET_AP_MANAGER_CLIENT_H_
diff --git a/buffet/privet/cloud_delegate.cc b/libweave/src/privet/cloud_delegate.cc similarity index 97% rename from buffet/privet/cloud_delegate.cc rename to libweave/src/privet/cloud_delegate.cc index 86c93cc..71db1ee 100644 --- a/buffet/privet/cloud_delegate.cc +++ b/libweave/src/privet/cloud_delegate.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/cloud_delegate.h" +#include "libweave/src/privet/cloud_delegate.h" #include <map> #include <vector> @@ -16,12 +16,12 @@ #include <chromeos/variant_dictionary.h> #include <dbus/bus.h> -#include "buffet/buffet_config.h" -#include "buffet/commands/command_manager.h" #include "buffet/dbus-proxies.h" -#include "buffet/device_registration_info.h" -#include "buffet/privet/constants.h" -#include "buffet/states/state_manager.h" +#include "libweave/src/buffet_config.h" +#include "libweave/src/commands/command_manager.h" +#include "libweave/src/device_registration_info.h" +#include "libweave/src/privet/constants.h" +#include "libweave/src/states/state_manager.h" namespace privetd {
diff --git a/buffet/privet/cloud_delegate.h b/libweave/src/privet/cloud_delegate.h similarity index 94% rename from buffet/privet/cloud_delegate.h rename to libweave/src/privet/cloud_delegate.h index 49dfd7d..d0ac32d 100644 --- a/buffet/privet/cloud_delegate.h +++ b/libweave/src/privet/cloud_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_CLOUD_DELEGATE_H_ -#define BUFFET_PRIVET_CLOUD_DELEGATE_H_ +#ifndef LIBWEAVE_SRC_PRIVET_CLOUD_DELEGATE_H_ +#define LIBWEAVE_SRC_PRIVET_CLOUD_DELEGATE_H_ #include <memory> #include <set> @@ -13,8 +13,8 @@ #include <base/memory/ref_counted.h> #include <base/observer_list.h> -#include "buffet/privet/privet_types.h" -#include "buffet/privet/security_delegate.h" +#include "libweave/src/privet/privet_types.h" +#include "libweave/src/privet/security_delegate.h" namespace base { class DictionaryValue; @@ -143,4 +143,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_CLOUD_DELEGATE_H_ +#endif // LIBWEAVE_SRC_PRIVET_CLOUD_DELEGATE_H_
diff --git a/buffet/privet/constants.cc b/libweave/src/privet/constants.cc similarity index 96% rename from buffet/privet/constants.cc rename to libweave/src/privet/constants.cc index e94b541..fe69a51 100644 --- a/buffet/privet/constants.cc +++ b/libweave/src/privet/constants.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/constants.h" +#include "libweave/src/privet/constants.h" namespace privetd {
diff --git a/buffet/privet/constants.h b/libweave/src/privet/constants.h similarity index 89% rename from buffet/privet/constants.h rename to libweave/src/privet/constants.h index c408ca1..17497d7 100644 --- a/buffet/privet/constants.h +++ b/libweave/src/privet/constants.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_CONSTANTS_H_ -#define BUFFET_PRIVET_CONSTANTS_H_ +#ifndef LIBWEAVE_SRC_PRIVET_CONSTANTS_H_ +#define LIBWEAVE_SRC_PRIVET_CONSTANTS_H_ namespace privetd { @@ -38,4 +38,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_CONSTANTS_H_ +#endif // LIBWEAVE_SRC_PRIVET_CONSTANTS_H_
diff --git a/buffet/privet/device_delegate.cc b/libweave/src/privet/device_delegate.cc similarity index 92% rename from buffet/privet/device_delegate.cc rename to libweave/src/privet/device_delegate.cc index 8670696..8e5d2bb 100644 --- a/buffet/privet/device_delegate.cc +++ b/libweave/src/privet/device_delegate.cc
@@ -2,12 +2,12 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/device_delegate.h" +#include "libweave/src/privet/device_delegate.h" #include <base/files/file_util.h> #include <base/guid.h> -#include "buffet/privet/constants.h" +#include "libweave/src/privet/constants.h" namespace privetd {
diff --git a/buffet/privet/device_delegate.h b/libweave/src/privet/device_delegate.h similarity index 89% rename from buffet/privet/device_delegate.h rename to libweave/src/privet/device_delegate.h index 9888dfd..a125a61 100644 --- a/buffet/privet/device_delegate.h +++ b/libweave/src/privet/device_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_DEVICE_DELEGATE_H_ -#define BUFFET_PRIVET_DEVICE_DELEGATE_H_ +#ifndef LIBWEAVE_SRC_PRIVET_DEVICE_DELEGATE_H_ +#define LIBWEAVE_SRC_PRIVET_DEVICE_DELEGATE_H_ #include <memory> #include <utility> @@ -42,4 +42,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_DEVICE_DELEGATE_H_ +#endif // LIBWEAVE_SRC_PRIVET_DEVICE_DELEGATE_H_
diff --git a/buffet/privet/identity_delegate.h b/libweave/src/privet/identity_delegate.h similarity index 76% rename from buffet/privet/identity_delegate.h rename to libweave/src/privet/identity_delegate.h index 5ab97d1..ea4fa09 100644 --- a/buffet/privet/identity_delegate.h +++ b/libweave/src/privet/identity_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_IDENTITY_DELEGATE_H_ -#define BUFFET_PRIVET_IDENTITY_DELEGATE_H_ +#ifndef LIBWEAVE_SRC_PRIVET_IDENTITY_DELEGATE_H_ +#define LIBWEAVE_SRC_PRIVET_IDENTITY_DELEGATE_H_ #include <string> @@ -21,4 +21,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_IDENTITY_DELEGATE_H_ +#endif // LIBWEAVE_SRC_PRIVET_IDENTITY_DELEGATE_H_
diff --git a/buffet/privet/mock_delegates.h b/libweave/src/privet/mock_delegates.h similarity index 95% rename from buffet/privet/mock_delegates.h rename to libweave/src/privet/mock_delegates.h index ff8c11b..16d95b5 100644 --- a/buffet/privet/mock_delegates.h +++ b/libweave/src/privet/mock_delegates.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_MOCK_DELEGATES_H_ -#define BUFFET_PRIVET_MOCK_DELEGATES_H_ +#ifndef LIBWEAVE_SRC_PRIVET_MOCK_DELEGATES_H_ +#define LIBWEAVE_SRC_PRIVET_MOCK_DELEGATES_H_ #include <set> #include <string> @@ -13,11 +13,11 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/privet/cloud_delegate.h" -#include "buffet/privet/device_delegate.h" -#include "buffet/privet/identity_delegate.h" -#include "buffet/privet/security_delegate.h" -#include "buffet/privet/wifi_delegate.h" +#include "libweave/src/privet/cloud_delegate.h" +#include "libweave/src/privet/device_delegate.h" +#include "libweave/src/privet/identity_delegate.h" +#include "libweave/src/privet/security_delegate.h" +#include "libweave/src/privet/wifi_delegate.h" using testing::_; using testing::Return; @@ -226,4 +226,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_MOCK_DELEGATES_H_ +#endif // LIBWEAVE_SRC_PRIVET_MOCK_DELEGATES_H_
diff --git a/buffet/privet/openssl_utils.cc b/libweave/src/privet/openssl_utils.cc similarity index 92% rename from buffet/privet/openssl_utils.cc rename to libweave/src/privet/openssl_utils.cc index bcaf422..705eb1f 100644 --- a/buffet/privet/openssl_utils.cc +++ b/libweave/src/privet/openssl_utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/openssl_utils.h" +#include "libweave/src/privet/openssl_utils.h" #include <algorithm>
diff --git a/buffet/privet/openssl_utils.h b/libweave/src/privet/openssl_utils.h similarity index 75% rename from buffet/privet/openssl_utils.h rename to libweave/src/privet/openssl_utils.h index 587b60c..fffcaed 100644 --- a/buffet/privet/openssl_utils.h +++ b/libweave/src/privet/openssl_utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_OPENSSL_UTILS_H_ -#define BUFFET_PRIVET_OPENSSL_UTILS_H_ +#ifndef LIBWEAVE_SRC_PRIVET_OPENSSL_UTILS_H_ +#define LIBWEAVE_SRC_PRIVET_OPENSSL_UTILS_H_ #include <string> #include <vector> @@ -19,4 +19,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_OPENSSL_UTILS_H_ +#endif // LIBWEAVE_SRC_PRIVET_OPENSSL_UTILS_H_
diff --git a/buffet/privet/peerd_client.cc b/libweave/src/privet/peerd_client.cc similarity index 94% rename from buffet/privet/peerd_client.cc rename to libweave/src/privet/peerd_client.cc index b052ab1..c2d3618 100644 --- a/buffet/privet/peerd_client.cc +++ b/libweave/src/privet/peerd_client.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/peerd_client.h" +#include "libweave/src/privet/peerd_client.h" #include <map> @@ -10,10 +10,10 @@ #include <chromeos/errors/error.h> #include <chromeos/strings/string_utils.h> -#include "buffet/privet/cloud_delegate.h" -#include "buffet/privet/device_delegate.h" -#include "buffet/privet/wifi_bootstrap_manager.h" -#include "buffet/privet/wifi_ssid_generator.h" +#include "libweave/src/privet/cloud_delegate.h" +#include "libweave/src/privet/device_delegate.h" +#include "libweave/src/privet/wifi_bootstrap_manager.h" +#include "libweave/src/privet/wifi_ssid_generator.h" using chromeos::string_utils::Join; using org::chromium::peerd::PeerProxy;
diff --git a/buffet/privet/peerd_client.h b/libweave/src/privet/peerd_client.h similarity index 91% rename from buffet/privet/peerd_client.h rename to libweave/src/privet/peerd_client.h index ae3d306..e5f90b7 100644 --- a/buffet/privet/peerd_client.h +++ b/libweave/src/privet/peerd_client.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_PEERD_CLIENT_H_ -#define BUFFET_PRIVET_PEERD_CLIENT_H_ +#ifndef LIBWEAVE_SRC_PRIVET_PEERD_CLIENT_H_ +#define LIBWEAVE_SRC_PRIVET_PEERD_CLIENT_H_ #include <memory> #include <string> @@ -11,7 +11,7 @@ #include <base/callback.h> #include <base/memory/ref_counted.h> -#include "buffet/privet/identity_delegate.h" +#include "libweave/src/privet/identity_delegate.h" #include "peerd/dbus-proxies.h" namespace dbus { @@ -69,4 +69,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_PEERD_CLIENT_H_ +#endif // LIBWEAVE_SRC_PRIVET_PEERD_CLIENT_H_
diff --git a/buffet/privet/privet_handler.cc b/libweave/src/privet/privet_handler.cc similarity index 98% rename from buffet/privet/privet_handler.cc rename to libweave/src/privet/privet_handler.cc index 5c3d0c2..9b34498 100644 --- a/buffet/privet/privet_handler.cc +++ b/libweave/src/privet/privet_handler.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/privet_handler.h" +#include "libweave/src/privet/privet_handler.h" #include <memory> #include <set> @@ -18,12 +18,12 @@ #include <chromeos/http/http_request.h> #include <chromeos/strings/string_utils.h> -#include "buffet/privet/cloud_delegate.h" -#include "buffet/privet/constants.h" -#include "buffet/privet/device_delegate.h" -#include "buffet/privet/identity_delegate.h" -#include "buffet/privet/security_delegate.h" -#include "buffet/privet/wifi_delegate.h" +#include "libweave/src/privet/cloud_delegate.h" +#include "libweave/src/privet/constants.h" +#include "libweave/src/privet/device_delegate.h" +#include "libweave/src/privet/identity_delegate.h" +#include "libweave/src/privet/security_delegate.h" +#include "libweave/src/privet/wifi_delegate.h" namespace privetd {
diff --git a/buffet/privet/privet_handler.h b/libweave/src/privet/privet_handler.h similarity index 96% rename from buffet/privet/privet_handler.h rename to libweave/src/privet/privet_handler.h index bb86c0a..f251cc4 100644 --- a/buffet/privet/privet_handler.h +++ b/libweave/src/privet/privet_handler.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_PRIVET_HANDLER_H_ -#define BUFFET_PRIVET_PRIVET_HANDLER_H_ +#ifndef LIBWEAVE_SRC_PRIVET_PRIVET_HANDLER_H_ +#define LIBWEAVE_SRC_PRIVET_PRIVET_HANDLER_H_ #include <map> #include <string> @@ -13,7 +13,7 @@ #include <base/memory/weak_ptr.h> #include <base/scoped_observer.h> -#include "buffet/privet/cloud_delegate.h" +#include "libweave/src/privet/cloud_delegate.h" namespace base { class Value; @@ -136,4 +136,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_PRIVET_HANDLER_H_ +#endif // LIBWEAVE_SRC_PRIVET_PRIVET_HANDLER_H_
diff --git a/buffet/privet/privet_handler_unittest.cc b/libweave/src/privet/privet_handler_unittest.cc similarity index 98% rename from buffet/privet/privet_handler_unittest.cc rename to libweave/src/privet/privet_handler_unittest.cc index 2ae76d9..a5491ff 100644 --- a/buffet/privet/privet_handler_unittest.cc +++ b/libweave/src/privet/privet_handler_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/privet_handler.h" +#include "libweave/src/privet/privet_handler.h" #include <set> #include <string> @@ -18,8 +18,8 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/privet/constants.h" -#include "buffet/privet/mock_delegates.h" +#include "libweave/src/privet/constants.h" +#include "libweave/src/privet/mock_delegates.h" using testing::_; using testing::DoAll;
diff --git a/buffet/privet/privet_manager.cc b/libweave/src/privet/privet_manager.cc similarity index 92% rename from buffet/privet/privet_manager.cc rename to libweave/src/privet/privet_manager.cc index bdea47a..1281c91 100644 --- a/buffet/privet/privet_manager.cc +++ b/libweave/src/privet/privet_manager.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/privet_manager.h" +#include "libweave/src/privet/privet_manager.h" #include <memory> #include <set> @@ -28,16 +28,16 @@ #include <libwebserv/server.h> #include "buffet/dbus_constants.h" -#include "buffet/device_registration_info.h" -#include "buffet/privet/ap_manager_client.h" -#include "buffet/privet/cloud_delegate.h" -#include "buffet/privet/constants.h" -#include "buffet/privet/device_delegate.h" -#include "buffet/privet/peerd_client.h" -#include "buffet/privet/privet_handler.h" -#include "buffet/privet/security_manager.h" -#include "buffet/privet/shill_client.h" -#include "buffet/privet/wifi_bootstrap_manager.h" +#include "libweave/src/device_registration_info.h" +#include "libweave/src/privet/ap_manager_client.h" +#include "libweave/src/privet/cloud_delegate.h" +#include "libweave/src/privet/constants.h" +#include "libweave/src/privet/device_delegate.h" +#include "libweave/src/privet/peerd_client.h" +#include "libweave/src/privet/privet_handler.h" +#include "libweave/src/privet/security_manager.h" +#include "libweave/src/privet/shill_client.h" +#include "libweave/src/privet/wifi_bootstrap_manager.h" namespace privetd {
diff --git a/buffet/privet/privet_manager.h b/libweave/src/privet/privet_manager.h similarity index 93% rename from buffet/privet/privet_manager.h rename to libweave/src/privet/privet_manager.h index 2af19d1..757136a 100644 --- a/buffet/privet/privet_manager.h +++ b/libweave/src/privet/privet_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_PRIVET_MANAGER_H_ -#define BUFFET_PRIVET_PRIVET_MANAGER_H_ +#ifndef LIBWEAVE_SRC_PRIVET_PRIVET_MANAGER_H_ +#define LIBWEAVE_SRC_PRIVET_PRIVET_MANAGER_H_ #include <memory> #include <set> @@ -13,7 +13,7 @@ #include <base/memory/weak_ptr.h> #include <base/scoped_observer.h> -#include "buffet/privet/cloud_delegate.h" +#include "libweave/src/privet/cloud_delegate.h" namespace buffet { class CommandManager; @@ -115,4 +115,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_PRIVET_MANAGER_H_ +#endif // LIBWEAVE_SRC_PRIVET_PRIVET_MANAGER_H_
diff --git a/buffet/privet/privet_types.h b/libweave/src/privet/privet_types.h similarity index 93% rename from buffet/privet/privet_types.h rename to libweave/src/privet/privet_types.h index c1e2ba0..06c10b8 100644 --- a/buffet/privet/privet_types.h +++ b/libweave/src/privet/privet_types.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_PRIVET_TYPES_H_ -#define BUFFET_PRIVET_PRIVET_TYPES_H_ +#ifndef LIBWEAVE_SRC_PRIVET_PRIVET_TYPES_H_ +#define LIBWEAVE_SRC_PRIVET_PRIVET_TYPES_H_ #include <string> @@ -95,4 +95,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_PRIVET_TYPES_H_ +#endif // LIBWEAVE_SRC_PRIVET_PRIVET_TYPES_H_
diff --git a/buffet/privet/security_delegate.h b/libweave/src/privet/security_delegate.h similarity index 92% rename from buffet/privet/security_delegate.h rename to libweave/src/privet/security_delegate.h index f69ffb2..13467c9 100644 --- a/buffet/privet/security_delegate.h +++ b/libweave/src/privet/security_delegate.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_SECURITY_DELEGATE_H_ -#define BUFFET_PRIVET_SECURITY_DELEGATE_H_ +#ifndef LIBWEAVE_SRC_PRIVET_SECURITY_DELEGATE_H_ +#define LIBWEAVE_SRC_PRIVET_SECURITY_DELEGATE_H_ #include <memory> #include <set> @@ -12,7 +12,7 @@ #include <base/time/time.h> #include <chromeos/secure_blob.h> -#include "buffet/privet/privet_types.h" +#include "libweave/src/privet/privet_types.h" namespace privetd { @@ -76,4 +76,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_SECURITY_DELEGATE_H_ +#endif // LIBWEAVE_SRC_PRIVET_SECURITY_DELEGATE_H_
diff --git a/buffet/privet/security_manager.cc b/libweave/src/privet/security_manager.cc similarity index 98% rename from buffet/privet/security_manager.cc rename to libweave/src/privet/security_manager.cc index fd94d78..9ab6266 100644 --- a/buffet/privet/security_manager.cc +++ b/libweave/src/privet/security_manager.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/security_manager.h" +#include "libweave/src/privet/security_manager.h" #include <algorithm> #include <limits> @@ -23,8 +23,8 @@ #include <chromeos/strings/string_utils.h> #include <crypto/p224_spake.h> -#include "buffet/privet/constants.h" -#include "buffet/privet/openssl_utils.h" +#include "libweave/src/privet/constants.h" +#include "libweave/src/privet/openssl_utils.h" namespace privetd {
diff --git a/buffet/privet/security_manager.h b/libweave/src/privet/security_manager.h similarity index 94% rename from buffet/privet/security_manager.h rename to libweave/src/privet/security_manager.h index 04a942e..fbce41b 100644 --- a/buffet/privet/security_manager.h +++ b/libweave/src/privet/security_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_SECURITY_MANAGER_H_ -#define BUFFET_PRIVET_SECURITY_MANAGER_H_ +#ifndef LIBWEAVE_SRC_PRIVET_SECURITY_MANAGER_H_ +#define LIBWEAVE_SRC_PRIVET_SECURITY_MANAGER_H_ #include <map> #include <memory> @@ -17,7 +17,7 @@ #include <chromeos/errors/error.h> #include <chromeos/secure_blob.h> -#include "buffet/privet/security_delegate.h" +#include "libweave/src/privet/security_delegate.h" namespace crypto { class P224EncryptedKeyExchange; @@ -107,4 +107,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_SECURITY_MANAGER_H_ +#endif // LIBWEAVE_SRC_PRIVET_SECURITY_MANAGER_H_
diff --git a/buffet/privet/security_manager_unittest.cc b/libweave/src/privet/security_manager_unittest.cc similarity index 98% rename from buffet/privet/security_manager_unittest.cc rename to libweave/src/privet/security_manager_unittest.cc index 32b7463..135668e 100644 --- a/buffet/privet/security_manager_unittest.cc +++ b/libweave/src/privet/security_manager_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/security_manager.h" +#include "libweave/src/privet/security_manager.h" #include <algorithm> #include <cctype> @@ -26,7 +26,7 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/privet/openssl_utils.h" +#include "libweave/src/privet/openssl_utils.h" using testing::Eq; using testing::_;
diff --git a/buffet/privet/shill_client.cc b/libweave/src/privet/shill_client.cc similarity index 99% rename from buffet/privet/shill_client.cc rename to libweave/src/privet/shill_client.cc index 48d0cef..da9eb35 100644 --- a/buffet/privet/shill_client.cc +++ b/libweave/src/privet/shill_client.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/shill_client.h" +#include "libweave/src/privet/shill_client.h" #include <set>
diff --git a/buffet/privet/shill_client.h b/libweave/src/privet/shill_client.h similarity index 97% rename from buffet/privet/shill_client.h rename to libweave/src/privet/shill_client.h index 6839b15..95b9b6d 100644 --- a/buffet/privet/shill_client.h +++ b/libweave/src/privet/shill_client.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_SHILL_CLIENT_H_ -#define BUFFET_PRIVET_SHILL_CLIENT_H_ +#ifndef LIBWEAVE_SRC_PRIVET_SHILL_CLIENT_H_ +#define LIBWEAVE_SRC_PRIVET_SHILL_CLIENT_H_ #include <map> #include <set> @@ -130,4 +130,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_SHILL_CLIENT_H_ +#endif // LIBWEAVE_SRC_PRIVET_SHILL_CLIENT_H_
diff --git a/buffet/privet/wifi_bootstrap_manager.cc b/libweave/src/privet/wifi_bootstrap_manager.cc similarity index 97% rename from buffet/privet/wifi_bootstrap_manager.cc rename to libweave/src/privet/wifi_bootstrap_manager.cc index 975717c..00e1503 100644 --- a/buffet/privet/wifi_bootstrap_manager.cc +++ b/libweave/src/privet/wifi_bootstrap_manager.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/wifi_bootstrap_manager.h" +#include "libweave/src/privet/wifi_bootstrap_manager.h" #include <base/logging.h> #include <base/memory/weak_ptr.h> @@ -10,9 +10,9 @@ #include <chromeos/bind_lambda.h> #include <chromeos/key_value_store.h> -#include "buffet/privet/ap_manager_client.h" -#include "buffet/privet/constants.h" -#include "buffet/privet/shill_client.h" +#include "libweave/src/privet/ap_manager_client.h" +#include "libweave/src/privet/constants.h" +#include "libweave/src/privet/shill_client.h" namespace privetd {
diff --git a/buffet/privet/wifi_bootstrap_manager.h b/libweave/src/privet/wifi_bootstrap_manager.h similarity index 91% rename from buffet/privet/wifi_bootstrap_manager.h rename to libweave/src/privet/wifi_bootstrap_manager.h index 5f0a4b5..b749ff0 100644 --- a/buffet/privet/wifi_bootstrap_manager.h +++ b/libweave/src/privet/wifi_bootstrap_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_WIFI_BOOTSTRAP_MANAGER_H_ -#define BUFFET_PRIVET_WIFI_BOOTSTRAP_MANAGER_H_ +#ifndef LIBWEAVE_SRC_PRIVET_WIFI_BOOTSTRAP_MANAGER_H_ +#define LIBWEAVE_SRC_PRIVET_WIFI_BOOTSTRAP_MANAGER_H_ #include <set> #include <string> @@ -15,10 +15,10 @@ #include <base/memory/weak_ptr.h> #include <base/scoped_observer.h> -#include "buffet/privet/cloud_delegate.h" -#include "buffet/privet/privet_types.h" -#include "buffet/privet/wifi_delegate.h" -#include "buffet/privet/wifi_ssid_generator.h" +#include "libweave/src/privet/cloud_delegate.h" +#include "libweave/src/privet/privet_types.h" +#include "libweave/src/privet/wifi_delegate.h" +#include "libweave/src/privet/wifi_ssid_generator.h" namespace privetd { @@ -118,4 +118,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_WIFI_BOOTSTRAP_MANAGER_H_ +#endif // LIBWEAVE_SRC_PRIVET_WIFI_BOOTSTRAP_MANAGER_H_
diff --git a/buffet/privet/wifi_delegate.h b/libweave/src/privet/wifi_delegate.h similarity index 89% rename from buffet/privet/wifi_delegate.h rename to libweave/src/privet/wifi_delegate.h index f350652..b590b01 100644 --- a/buffet/privet/wifi_delegate.h +++ b/libweave/src/privet/wifi_delegate.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_WIFI_DELEGATE_H_ -#define BUFFET_PRIVET_WIFI_DELEGATE_H_ +#ifndef LIBWEAVE_SRC_PRIVET_WIFI_DELEGATE_H_ +#define LIBWEAVE_SRC_PRIVET_WIFI_DELEGATE_H_ #include <memory> #include <set> #include <string> -#include "buffet/privet/privet_types.h" +#include "libweave/src/privet/privet_types.h" namespace privetd { @@ -52,4 +52,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_WIFI_DELEGATE_H_ +#endif // LIBWEAVE_SRC_PRIVET_WIFI_DELEGATE_H_
diff --git a/buffet/privet/wifi_ssid_generator.cc b/libweave/src/privet/wifi_ssid_generator.cc similarity index 92% rename from buffet/privet/wifi_ssid_generator.cc rename to libweave/src/privet/wifi_ssid_generator.cc index 0fa0c7c..15a5471 100644 --- a/buffet/privet/wifi_ssid_generator.cc +++ b/libweave/src/privet/wifi_ssid_generator.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/wifi_ssid_generator.h" +#include "libweave/src/privet/wifi_ssid_generator.h" #include <bitset> @@ -11,9 +11,9 @@ #include <base/strings/string_number_conversions.h> #include <base/strings/stringprintf.h> -#include "buffet/privet/cloud_delegate.h" -#include "buffet/privet/device_delegate.h" -#include "buffet/privet/wifi_delegate.h" +#include "libweave/src/privet/cloud_delegate.h" +#include "libweave/src/privet/device_delegate.h" +#include "libweave/src/privet/wifi_delegate.h" namespace privetd {
diff --git a/buffet/privet/wifi_ssid_generator.h b/libweave/src/privet/wifi_ssid_generator.h similarity index 85% rename from buffet/privet/wifi_ssid_generator.h rename to libweave/src/privet/wifi_ssid_generator.h index 33e9628..8e7ec63 100644 --- a/buffet/privet/wifi_ssid_generator.h +++ b/libweave/src/privet/wifi_ssid_generator.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_PRIVET_WIFI_SSID_GENERATOR_H_ -#define BUFFET_PRIVET_WIFI_SSID_GENERATOR_H_ +#ifndef LIBWEAVE_SRC_PRIVET_WIFI_SSID_GENERATOR_H_ +#define LIBWEAVE_SRC_PRIVET_WIFI_SSID_GENERATOR_H_ #include <string> @@ -40,4 +40,4 @@ } // namespace privetd -#endif // BUFFET_PRIVET_WIFI_SSID_GENERATOR_H_ +#endif // LIBWEAVE_SRC_PRIVET_WIFI_SSID_GENERATOR_H_
diff --git a/buffet/privet/wifi_ssid_generator_unittest.cc b/libweave/src/privet/wifi_ssid_generator_unittest.cc similarity index 93% rename from buffet/privet/wifi_ssid_generator_unittest.cc rename to libweave/src/privet/wifi_ssid_generator_unittest.cc index 16c4475..fed1fb1 100644 --- a/buffet/privet/wifi_ssid_generator_unittest.cc +++ b/libweave/src/privet/wifi_ssid_generator_unittest.cc
@@ -2,13 +2,13 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/privet/wifi_ssid_generator.h" +#include "libweave/src/privet/wifi_ssid_generator.h" #include <base/strings/utf_string_conversions.h> #include <gtest/gtest.h> -#include "buffet/privet/mock_delegates.h" -#include "buffet/privet/openssl_utils.h" +#include "libweave/src/privet/mock_delegates.h" +#include "libweave/src/privet/openssl_utils.h" namespace privetd {
diff --git a/buffet/registration_status.cc b/libweave/src/registration_status.cc similarity index 93% rename from buffet/registration_status.cc rename to libweave/src/registration_status.cc index 653715c..cfa2cca 100644 --- a/buffet/registration_status.cc +++ b/libweave/src/registration_status.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/registration_status.h" +#include "libweave/src/registration_status.h" #include <base/logging.h>
diff --git a/buffet/registration_status.h b/libweave/src/registration_status.h similarity index 82% rename from buffet/registration_status.h rename to libweave/src/registration_status.h index 6b75f4d..1eeef7e 100644 --- a/buffet/registration_status.h +++ b/libweave/src/registration_status.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_REGISTRATION_STATUS_H_ -#define BUFFET_REGISTRATION_STATUS_H_ +#ifndef LIBWEAVE_SRC_REGISTRATION_STATUS_H_ +#define LIBWEAVE_SRC_REGISTRATION_STATUS_H_ #include <string> @@ -21,4 +21,4 @@ } // namespace buffet -#endif // BUFFET_REGISTRATION_STATUS_H_ +#endif // LIBWEAVE_SRC_REGISTRATION_STATUS_H_
diff --git a/buffet/states/error_codes.cc b/libweave/src/states/error_codes.cc similarity index 92% rename from buffet/states/error_codes.cc rename to libweave/src/states/error_codes.cc index 3faea7e..2e3940b 100644 --- a/buffet/states/error_codes.cc +++ b/libweave/src/states/error_codes.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/states/error_codes.h" +#include "libweave/src/states/error_codes.h" namespace buffet { namespace errors {
diff --git a/buffet/states/error_codes.h b/libweave/src/states/error_codes.h similarity index 80% rename from buffet/states/error_codes.h rename to libweave/src/states/error_codes.h index 2298741..71fe3fe 100644 --- a/buffet/states/error_codes.h +++ b/libweave/src/states/error_codes.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STATES_ERROR_CODES_H_ -#define BUFFET_STATES_ERROR_CODES_H_ +#ifndef LIBWEAVE_SRC_STATES_ERROR_CODES_H_ +#define LIBWEAVE_SRC_STATES_ERROR_CODES_H_ namespace buffet { namespace errors { @@ -22,4 +22,4 @@ } // namespace errors } // namespace buffet -#endif // BUFFET_STATES_ERROR_CODES_H_ +#endif // LIBWEAVE_SRC_STATES_ERROR_CODES_H_
diff --git a/buffet/states/mock_state_change_queue_interface.h b/libweave/src/states/mock_state_change_queue_interface.h similarity index 80% rename from buffet/states/mock_state_change_queue_interface.h rename to libweave/src/states/mock_state_change_queue_interface.h index 127e01d..c11177a 100644 --- a/buffet/states/mock_state_change_queue_interface.h +++ b/libweave/src/states/mock_state_change_queue_interface.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STATES_MOCK_STATE_CHANGE_QUEUE_INTERFACE_H_ -#define BUFFET_STATES_MOCK_STATE_CHANGE_QUEUE_INTERFACE_H_ +#ifndef LIBWEAVE_SRC_STATES_MOCK_STATE_CHANGE_QUEUE_INTERFACE_H_ +#define LIBWEAVE_SRC_STATES_MOCK_STATE_CHANGE_QUEUE_INTERFACE_H_ #include <vector> #include <gmock/gmock.h> -#include "buffet/states/state_change_queue_interface.h" +#include "libweave/src/states/state_change_queue_interface.h" namespace buffet { @@ -35,4 +35,4 @@ } // namespace buffet -#endif // BUFFET_STATES_MOCK_STATE_CHANGE_QUEUE_INTERFACE_H_ +#endif // LIBWEAVE_SRC_STATES_MOCK_STATE_CHANGE_QUEUE_INTERFACE_H_
diff --git a/buffet/states/state_change_queue.cc b/libweave/src/states/state_change_queue.cc similarity index 97% rename from buffet/states/state_change_queue.cc rename to libweave/src/states/state_change_queue.cc index 00ec41a..c0f3520 100644 --- a/buffet/states/state_change_queue.cc +++ b/libweave/src/states/state_change_queue.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/states/state_change_queue.h" +#include "libweave/src/states/state_change_queue.h" #include <base/logging.h>
diff --git a/buffet/states/state_change_queue.h b/libweave/src/states/state_change_queue.h similarity index 89% rename from buffet/states/state_change_queue.h rename to libweave/src/states/state_change_queue.h index 26ea9cd..332c542 100644 --- a/buffet/states/state_change_queue.h +++ b/libweave/src/states/state_change_queue.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STATES_STATE_CHANGE_QUEUE_H_ -#define BUFFET_STATES_STATE_CHANGE_QUEUE_H_ +#ifndef LIBWEAVE_SRC_STATES_STATE_CHANGE_QUEUE_H_ +#define LIBWEAVE_SRC_STATES_STATE_CHANGE_QUEUE_H_ #include <map> #include <vector> @@ -11,7 +11,7 @@ #include <base/macros.h> #include <base/threading/thread_checker.h> -#include "buffet/states/state_change_queue_interface.h" +#include "libweave/src/states/state_change_queue_interface.h" namespace buffet { @@ -56,4 +56,4 @@ } // namespace buffet -#endif // BUFFET_STATES_STATE_CHANGE_QUEUE_H_ +#endif // LIBWEAVE_SRC_STATES_STATE_CHANGE_QUEUE_H_
diff --git a/buffet/states/state_change_queue_interface.h b/libweave/src/states/state_change_queue_interface.h similarity index 90% rename from buffet/states/state_change_queue_interface.h rename to libweave/src/states/state_change_queue_interface.h index 2f11e6b..fb9b6e5 100644 --- a/buffet/states/state_change_queue_interface.h +++ b/libweave/src/states/state_change_queue_interface.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STATES_STATE_CHANGE_QUEUE_INTERFACE_H_ -#define BUFFET_STATES_STATE_CHANGE_QUEUE_INTERFACE_H_ +#ifndef LIBWEAVE_SRC_STATES_STATE_CHANGE_QUEUE_INTERFACE_H_ +#define LIBWEAVE_SRC_STATES_STATE_CHANGE_QUEUE_INTERFACE_H_ #include <vector> @@ -11,7 +11,7 @@ #include <base/time/time.h> #include <chromeos/variant_dictionary.h> -#include "buffet/commands/schema_utils.h" +#include "libweave/src/commands/schema_utils.h" namespace buffet { @@ -66,4 +66,4 @@ } // namespace buffet -#endif // BUFFET_STATES_STATE_CHANGE_QUEUE_INTERFACE_H_ +#endif // LIBWEAVE_SRC_STATES_STATE_CHANGE_QUEUE_INTERFACE_H_
diff --git a/buffet/states/state_change_queue_unittest.cc b/libweave/src/states/state_change_queue_unittest.cc similarity index 98% rename from buffet/states/state_change_queue_unittest.cc rename to libweave/src/states/state_change_queue_unittest.cc index 091e5c3..c7778ee 100644 --- a/buffet/states/state_change_queue_unittest.cc +++ b/libweave/src/states/state_change_queue_unittest.cc
@@ -3,12 +3,12 @@ // found in the LICENSE file. -#include "buffet/states/state_change_queue.h" +#include "libweave/src/states/state_change_queue.h" #include <chromeos/bind_lambda.h> #include <gtest/gtest.h> -#include "buffet/commands/unittest_utils.h" +#include "libweave/src/commands/unittest_utils.h" namespace buffet {
diff --git a/buffet/states/state_manager.cc b/libweave/src/states/state_manager.cc similarity index 98% rename from buffet/states/state_manager.cc rename to libweave/src/states/state_manager.cc index 2ce78c1..4358c40 100644 --- a/buffet/states/state_manager.cc +++ b/libweave/src/states/state_manager.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/states/state_manager.h" +#include "libweave/src/states/state_manager.h" #include <base/files/file_enumerator.h> #include <base/files/file_path.h> @@ -12,9 +12,9 @@ #include <chromeos/key_value_store.h> #include <chromeos/strings/string_utils.h> -#include "buffet/states/error_codes.h" -#include "buffet/states/state_change_queue_interface.h" -#include "buffet/utils.h" +#include "libweave/src/states/error_codes.h" +#include "libweave/src/states/state_change_queue_interface.h" +#include "libweave/src/utils.h" namespace buffet {
diff --git a/buffet/states/state_manager.h b/libweave/src/states/state_manager.h similarity index 94% rename from buffet/states/state_manager.h rename to libweave/src/states/state_manager.h index 914daeb..83d1fdb 100644 --- a/buffet/states/state_manager.h +++ b/libweave/src/states/state_manager.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STATES_STATE_MANAGER_H_ -#define BUFFET_STATES_STATE_MANAGER_H_ +#ifndef LIBWEAVE_SRC_STATES_STATE_MANAGER_H_ +#define LIBWEAVE_SRC_STATES_STATE_MANAGER_H_ #include <map> #include <memory> @@ -17,8 +17,8 @@ #include <chromeos/errors/error.h> #include <chromeos/variant_dictionary.h> -#include "buffet/states/state_change_queue_interface.h" -#include "buffet/states/state_package.h" +#include "libweave/src/states/state_change_queue_interface.h" +#include "libweave/src/states/state_package.h" namespace base { class DictionaryValue; @@ -123,4 +123,4 @@ } // namespace buffet -#endif // BUFFET_STATES_STATE_MANAGER_H_ +#endif // LIBWEAVE_SRC_STATES_STATE_MANAGER_H_
diff --git a/buffet/states/state_manager_unittest.cc b/libweave/src/states/state_manager_unittest.cc similarity index 96% rename from buffet/states/state_manager_unittest.cc rename to libweave/src/states/state_manager_unittest.cc index 4437a18..2c65b54 100644 --- a/buffet/states/state_manager_unittest.cc +++ b/libweave/src/states/state_manager_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/states/state_manager.h" +#include "libweave/src/states/state_manager.h" #include <cstdlib> // for abs(). #include <vector> @@ -12,10 +12,10 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "buffet/commands/schema_constants.h" -#include "buffet/commands/unittest_utils.h" -#include "buffet/states/error_codes.h" -#include "buffet/states/mock_state_change_queue_interface.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/commands/unittest_utils.h" +#include "libweave/src/states/error_codes.h" +#include "libweave/src/states/mock_state_change_queue_interface.h" namespace buffet {
diff --git a/buffet/states/state_package.cc b/libweave/src/states/state_package.cc similarity index 94% rename from buffet/states/state_package.cc rename to libweave/src/states/state_package.cc index 1292339..0b26006 100644 --- a/buffet/states/state_package.cc +++ b/libweave/src/states/state_package.cc
@@ -2,16 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/states/state_package.h" +#include "libweave/src/states/state_package.h" #include <base/logging.h> #include <base/values.h> #include <chromeos/dbus/data_serialization.h> -#include "buffet/commands/prop_types.h" -#include "buffet/commands/prop_values.h" -#include "buffet/commands/schema_utils.h" -#include "buffet/states/error_codes.h" +#include "libweave/src/commands/prop_types.h" +#include "libweave/src/commands/prop_values.h" +#include "libweave/src/commands/schema_utils.h" +#include "libweave/src/states/error_codes.h" namespace buffet {
diff --git a/buffet/states/state_package.h b/libweave/src/states/state_package.h similarity index 92% rename from buffet/states/state_package.h rename to libweave/src/states/state_package.h index 1430b5c..9666870 100644 --- a/buffet/states/state_package.h +++ b/libweave/src/states/state_package.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STATES_STATE_PACKAGE_H_ -#define BUFFET_STATES_STATE_PACKAGE_H_ +#ifndef LIBWEAVE_SRC_STATES_STATE_PACKAGE_H_ +#define LIBWEAVE_SRC_STATES_STATE_PACKAGE_H_ #include <map> #include <memory> @@ -13,8 +13,8 @@ #include <chromeos/any.h> #include <chromeos/errors/error.h> -#include "buffet/commands/object_schema.h" -#include "buffet/commands/prop_values.h" +#include "libweave/src/commands/object_schema.h" +#include "libweave/src/commands/prop_values.h" namespace base { class DictionaryValue; @@ -86,4 +86,4 @@ } // namespace buffet -#endif // BUFFET_STATES_STATE_PACKAGE_H_ +#endif // LIBWEAVE_SRC_STATES_STATE_PACKAGE_H_
diff --git a/buffet/states/state_package_unittest.cc b/libweave/src/states/state_package_unittest.cc similarity index 98% rename from buffet/states/state_package_unittest.cc rename to libweave/src/states/state_package_unittest.cc index 179d206..28aa62c 100644 --- a/buffet/states/state_package_unittest.cc +++ b/libweave/src/states/state_package_unittest.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/states/state_package.h" +#include "libweave/src/states/state_package.h" #include <memory> #include <string> @@ -11,9 +11,9 @@ #include <chromeos/variant_dictionary.h> #include <gtest/gtest.h> -#include "buffet/commands/schema_constants.h" -#include "buffet/commands/unittest_utils.h" -#include "buffet/states/error_codes.h" +#include "libweave/src/commands/schema_constants.h" +#include "libweave/src/commands/unittest_utils.h" +#include "libweave/src/states/error_codes.h" namespace buffet {
diff --git a/buffet/storage_impls.cc b/libweave/src/storage_impls.cc similarity index 93% rename from buffet/storage_impls.cc rename to libweave/src/storage_impls.cc index d3242b7..78b01cd 100644 --- a/buffet/storage_impls.cc +++ b/libweave/src/storage_impls.cc
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/storage_impls.h" +#include "libweave/src/storage_impls.h" #include <string> #include <base/files/important_file_writer.h> #include <base/json/json_writer.h> -#include "buffet/utils.h" +#include "libweave/src/utils.h" namespace buffet {
diff --git a/buffet/storage_impls.h b/libweave/src/storage_impls.h similarity index 86% rename from buffet/storage_impls.h rename to libweave/src/storage_impls.h index 6bdf251..57d74b2 100644 --- a/buffet/storage_impls.h +++ b/libweave/src/storage_impls.h
@@ -2,14 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STORAGE_IMPLS_H_ -#define BUFFET_STORAGE_IMPLS_H_ +#ifndef LIBWEAVE_SRC_STORAGE_IMPLS_H_ +#define LIBWEAVE_SRC_STORAGE_IMPLS_H_ #include <base/files/file_util.h> #include <base/macros.h> #include <base/values.h> -#include "buffet/storage_interface.h" +#include "libweave/src/storage_interface.h" namespace buffet { @@ -41,4 +41,4 @@ } // namespace buffet -#endif // BUFFET_STORAGE_IMPLS_H_ +#endif // LIBWEAVE_SRC_STORAGE_IMPLS_H_
diff --git a/buffet/storage_interface.h b/libweave/src/storage_interface.h similarity index 87% rename from buffet/storage_interface.h rename to libweave/src/storage_interface.h index c224513..dc750ae 100644 --- a/buffet/storage_interface.h +++ b/libweave/src/storage_interface.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_STORAGE_INTERFACE_H_ -#define BUFFET_STORAGE_INTERFACE_H_ +#ifndef LIBWEAVE_SRC_STORAGE_INTERFACE_H_ +#define LIBWEAVE_SRC_STORAGE_INTERFACE_H_ #include <memory> @@ -29,4 +29,4 @@ } // namespace buffet -#endif // BUFFET_STORAGE_INTERFACE_H_ +#endif // LIBWEAVE_SRC_STORAGE_INTERFACE_H_
diff --git a/buffet/utils.cc b/libweave/src/utils.cc similarity index 98% rename from buffet/utils.cc rename to libweave/src/utils.cc index 33fc292..547d371 100644 --- a/buffet/utils.cc +++ b/libweave/src/utils.cc
@@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "buffet/utils.h" +#include "libweave/src/utils.h" #include <map> #include <netdb.h>
diff --git a/buffet/utils.h b/libweave/src/utils.h similarity index 93% rename from buffet/utils.h rename to libweave/src/utils.h index 8e4bfd6..c83aa9a 100644 --- a/buffet/utils.h +++ b/libweave/src/utils.h
@@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef BUFFET_UTILS_H_ -#define BUFFET_UTILS_H_ +#ifndef LIBWEAVE_SRC_UTILS_H_ +#define LIBWEAVE_SRC_UTILS_H_ #include <memory> #include <string> @@ -46,4 +46,4 @@ } // namespace buffet -#endif // BUFFET_UTILS_H_ +#endif // LIBWEAVE_SRC_UTILS_H_