libchromeos: Clean up/moved file into sub-directories Moved related files in libchromeos into sub-directories to make it easier to navigate code. BUG=None TEST=FEATURES=test emerge-link libchromeos buffet peerd CQ-DEPEND=CL:214763 Change-Id: I50d690f19f09a8f4d0da1154e63f58c76c415a55 Reviewed-on: https://chromium-review.googlesource.com/214499 Reviewed-by: Alex Vakulenko <avakulenko@chromium.org> Tested-by: Alex Vakulenko <avakulenko@chromium.org> Commit-Queue: Alex Vakulenko <avakulenko@chromium.org>
diff --git a/buffet/commands/command_dictionary.cc b/buffet/commands/command_dictionary.cc index 54753ad..51ffb3d 100644 --- a/buffet/commands/command_dictionary.cc +++ b/buffet/commands/command_dictionary.cc
@@ -5,7 +5,7 @@ #include "buffet/commands/command_dictionary.h" #include <base/values.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include "buffet/commands/command_definition.h" #include "buffet/commands/schema_constants.h"
diff --git a/buffet/commands/command_dictionary.h b/buffet/commands/command_dictionary.h index 10a4f9d..8356bcb 100644 --- a/buffet/commands/command_dictionary.h +++ b/buffet/commands/command_dictionary.h
@@ -11,7 +11,7 @@ #include <vector> #include <base/basictypes.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> namespace base { class Value;
diff --git a/buffet/commands/command_instance.cc b/buffet/commands/command_instance.cc index 7c1502c..d217574 100644 --- a/buffet/commands/command_instance.cc +++ b/buffet/commands/command_instance.cc
@@ -5,8 +5,8 @@ #include "buffet/commands/command_instance.h" #include <base/values.h> -#include <chromeos/error.h> -#include <chromeos/error_codes.h> +#include <chromeos/errors/error.h> +#include <chromeos/errors/error_codes.h> #include "buffet/commands/command_definition.h" #include "buffet/commands/command_dictionary.h"
diff --git a/buffet/commands/command_instance.h b/buffet/commands/command_instance.h index ebc43ad..6e482ad 100644 --- a/buffet/commands/command_instance.h +++ b/buffet/commands/command_instance.h
@@ -10,7 +10,7 @@ #include <string> #include <base/basictypes.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> #include "buffet/commands/prop_values.h" #include "buffet/commands/schema_utils.h"
diff --git a/buffet/commands/command_manager.cc b/buffet/commands/command_manager.cc index 6ba498e..3d55906 100644 --- a/buffet/commands/command_manager.cc +++ b/buffet/commands/command_manager.cc
@@ -8,8 +8,8 @@ #include <base/files/file_enumerator.h> #include <base/json/json_reader.h> #include <base/values.h> -#include <chromeos/error.h> -#include <chromeos/error_codes.h> +#include <chromeos/errors/error.h> +#include <chromeos/errors/error_codes.h> #include "buffet/commands/schema_constants.h"
diff --git a/buffet/commands/command_queue_unittest.cc b/buffet/commands/command_queue_unittest.cc index ce81ea4..36c760e 100644 --- a/buffet/commands/command_queue_unittest.cc +++ b/buffet/commands/command_queue_unittest.cc
@@ -6,7 +6,7 @@ #include <string> #include <vector> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include <gtest/gtest.h> #include "buffet/commands/command_dispatch_interface.h"
diff --git a/buffet/commands/dbus_command_proxy.cc b/buffet/commands/dbus_command_proxy.cc index 3ae30c1..56bc706 100644 --- a/buffet/commands/dbus_command_proxy.cc +++ b/buffet/commands/dbus_command_proxy.cc
@@ -4,8 +4,8 @@ #include "buffet/commands/dbus_command_proxy.h" -#include <chromeos/async_event_sequencer.h> -#include <chromeos/exported_object_manager.h> +#include <chromeos/dbus/async_event_sequencer.h> +#include <chromeos/dbus/exported_object_manager.h> #include "buffet/commands/command_instance.h" #include "buffet/commands/prop_constraints.h"
diff --git a/buffet/commands/object_schema.h b/buffet/commands/object_schema.h index d133b1a..8808fb0 100644 --- a/buffet/commands/object_schema.h +++ b/buffet/commands/object_schema.h
@@ -9,7 +9,7 @@ #include <memory> #include <string> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> namespace base { class Value;
diff --git a/buffet/commands/prop_constraints.h b/buffet/commands/prop_constraints.h index e765f44..fabf815 100644 --- a/buffet/commands/prop_constraints.h +++ b/buffet/commands/prop_constraints.h
@@ -11,8 +11,8 @@ #include <base/basictypes.h> #include <base/values.h> -#include <chromeos/error.h> -#include <chromeos/string_utils.h> +#include <chromeos/errors/error.h> +#include <chromeos/strings/string_utils.h> #include "buffet/commands/prop_values.h" #include "buffet/commands/schema_constants.h"
diff --git a/buffet/commands/prop_types.cc b/buffet/commands/prop_types.cc index f4de059..81c9546 100644 --- a/buffet/commands/prop_types.cc +++ b/buffet/commands/prop_types.cc
@@ -12,7 +12,7 @@ #include <base/logging.h> #include <base/values.h> #include <chromeos/any.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include "buffet/commands/object_schema.h" #include "buffet/commands/prop_values.h"
diff --git a/buffet/commands/prop_types.h b/buffet/commands/prop_types.h index 86a2960..3320202 100644 --- a/buffet/commands/prop_types.h +++ b/buffet/commands/prop_types.h
@@ -14,7 +14,7 @@ #include <vector> #include <chromeos/any.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> #include "buffet/commands/prop_constraints.h" #include "buffet/commands/prop_values.h"
diff --git a/buffet/commands/prop_values.h b/buffet/commands/prop_values.h index 106ab1d..1d1c26d 100644 --- a/buffet/commands/prop_values.h +++ b/buffet/commands/prop_values.h
@@ -10,7 +10,7 @@ #include <string> #include <chromeos/any.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> #include "buffet/commands/schema_utils.h"
diff --git a/buffet/commands/schema_utils.h b/buffet/commands/schema_utils.h index 16627af..3f84b19 100644 --- a/buffet/commands/schema_utils.h +++ b/buffet/commands/schema_utils.h
@@ -13,7 +13,7 @@ #include <vector> #include <base/values.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> namespace buffet {
diff --git a/buffet/device_registration_info.cc b/buffet/device_registration_info.cc index 7677a89..e3acea3 100644 --- a/buffet/device_registration_info.cc +++ b/buffet/device_registration_info.cc
@@ -11,10 +11,10 @@ #include <base/json/json_writer.h> #include <base/values.h> #include <chromeos/data_encoding.h> -#include <chromeos/http_transport_curl.h> -#include <chromeos/http_utils.h> +#include <chromeos/http/http_transport_curl.h> +#include <chromeos/http/http_utils.h> #include <chromeos/mime_utils.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include <chromeos/url_utils.h> #include "buffet/commands/command_definition.h"
diff --git a/buffet/device_registration_info.h b/buffet/device_registration_info.h index dc58eda..3e6f4c6 100644 --- a/buffet/device_registration_info.h +++ b/buffet/device_registration_info.h
@@ -13,8 +13,8 @@ #include <base/basictypes.h> #include <base/time/time.h> #include <chromeos/data_encoding.h> -#include <chromeos/error.h> -#include <chromeos/http_transport.h> +#include <chromeos/errors/error.h> +#include <chromeos/http/http_transport.h> #include "buffet/storage_interface.h"
diff --git a/buffet/device_registration_info_unittest.cc b/buffet/device_registration_info_unittest.cc index 27aeaa0..097c0a6 100644 --- a/buffet/device_registration_info_unittest.cc +++ b/buffet/device_registration_info_unittest.cc
@@ -5,8 +5,8 @@ #include <base/json/json_reader.h> #include <base/values.h> #include <chromeos/bind_lambda.h> -#include <chromeos/http_request.h> -#include <chromeos/http_transport_fake.h> +#include <chromeos/http/http_request.h> +#include <chromeos/http/http_transport_fake.h> #include <chromeos/mime_utils.h> #include <gtest/gtest.h>
diff --git a/buffet/main.cc b/buffet/main.cc index 18b7d4d..fde5c86 100644 --- a/buffet/main.cc +++ b/buffet/main.cc
@@ -12,8 +12,8 @@ #include <base/message_loop/message_loop.h> #include <base/strings/string_util.h> #include <base/strings/stringprintf.h> -#include <chromeos/async_event_sequencer.h> -#include <chromeos/exported_object_manager.h> +#include <chromeos/dbus/async_event_sequencer.h> +#include <chromeos/dbus/exported_object_manager.h> #include <dbus/bus.h> #include <sysexits.h>
diff --git a/buffet/manager.cc b/buffet/manager.cc index 8f2160a..ac693f1 100644 --- a/buffet/manager.cc +++ b/buffet/manager.cc
@@ -10,9 +10,9 @@ #include <base/bind.h> #include <base/bind_helpers.h> #include <base/json/json_writer.h> -#include <chromeos/async_event_sequencer.h> -#include <chromeos/error.h> -#include <chromeos/exported_object_manager.h> +#include <chromeos/dbus/async_event_sequencer.h> +#include <chromeos/dbus/exported_object_manager.h> +#include <chromeos/errors/error.h> #include <dbus/bus.h> #include <dbus/object_path.h> #include <dbus/values_util.h>
diff --git a/buffet/manager.h b/buffet/manager.h index e72d1c0..42401b9 100644 --- a/buffet/manager.h +++ b/buffet/manager.h
@@ -13,8 +13,8 @@ #include <base/memory/weak_ptr.h> #include <base/values.h> #include <chromeos/dbus/dbus_object.h> -#include <chromeos/error.h> -#include <chromeos/exported_property_set.h> +#include <chromeos/dbus/exported_property_set.h> +#include <chromeos/errors/error.h> #include "buffet/device_registration_info.h"