diff options
Diffstat (limited to 'chromeos')
-rw-r--r-- | chromeos/data_encoding.cc | 2 | ||||
-rw-r--r-- | chromeos/dbus/async_event_sequencer.cc (renamed from chromeos/async_event_sequencer.cc) | 2 | ||||
-rw-r--r-- | chromeos/dbus/async_event_sequencer.h (renamed from chromeos/async_event_sequencer.h) | 6 | ||||
-rw-r--r-- | chromeos/dbus/async_event_sequencer_unittest.cc (renamed from chromeos/async_event_sequencer_unittest.cc) | 2 | ||||
-rw-r--r-- | chromeos/dbus/dbus_object.cc | 6 | ||||
-rw-r--r-- | chromeos/dbus/dbus_object.h | 6 | ||||
-rw-r--r-- | chromeos/dbus/dbus_object_internal_impl.h | 2 | ||||
-rw-r--r-- | chromeos/dbus/dbus_param_reader.h | 4 | ||||
-rw-r--r-- | chromeos/dbus/exported_object_manager.cc (renamed from chromeos/exported_object_manager.cc) | 4 | ||||
-rw-r--r-- | chromeos/dbus/exported_object_manager.h (renamed from chromeos/exported_object_manager.h) | 8 | ||||
-rw-r--r-- | chromeos/dbus/exported_object_manager_unittest.cc (renamed from chromeos/exported_object_manager_unittest.cc) | 2 | ||||
-rw-r--r-- | chromeos/dbus/exported_property_set.cc (renamed from chromeos/exported_property_set.cc) | 10 | ||||
-rw-r--r-- | chromeos/dbus/exported_property_set.h (renamed from chromeos/exported_property_set.h) | 8 | ||||
-rw-r--r-- | chromeos/dbus/exported_property_set_unittest.cc (renamed from chromeos/exported_property_set_unittest.cc) | 5 | ||||
-rw-r--r-- | chromeos/dbus/mock_dbus_object.h | 2 | ||||
-rw-r--r-- | chromeos/dbus/utils.cc | 2 | ||||
-rw-r--r-- | chromeos/dbus/utils.h | 2 | ||||
-rw-r--r-- | chromeos/errors/error.cc (renamed from chromeos/error.cc) | 2 | ||||
-rw-r--r-- | chromeos/errors/error.h (renamed from chromeos/error.h) | 6 | ||||
-rw-r--r-- | chromeos/errors/error_codes.cc (renamed from chromeos/error_codes.cc) | 2 | ||||
-rw-r--r-- | chromeos/errors/error_codes.h (renamed from chromeos/error_codes.h) | 6 | ||||
-rw-r--r-- | chromeos/errors/error_unittest.cc (renamed from chromeos/error_unittest.cc) | 2 | ||||
-rw-r--r-- | chromeos/http/http_connection.h (renamed from chromeos/http_connection.h) | 10 | ||||
-rw-r--r-- | chromeos/http/http_connection_curl.cc (renamed from chromeos/http_connection_curl.cc) | 8 | ||||
-rw-r--r-- | chromeos/http/http_connection_curl.h (renamed from chromeos/http_connection_curl.h) | 8 | ||||
-rw-r--r-- | chromeos/http/http_connection_fake.cc (renamed from chromeos/http_connection_fake.cc) | 6 | ||||
-rw-r--r-- | chromeos/http/http_connection_fake.h (renamed from chromeos/http_connection_fake.h) | 10 | ||||
-rw-r--r-- | chromeos/http/http_request.cc (renamed from chromeos/http_request.cc) | 8 | ||||
-rw-r--r-- | chromeos/http/http_request.h (renamed from chromeos/http_request.h) | 12 | ||||
-rw-r--r-- | chromeos/http/http_transport.h (renamed from chromeos/http_transport.h) | 8 | ||||
-rw-r--r-- | chromeos/http/http_transport_curl.cc (renamed from chromeos/http_transport_curl.cc) | 6 | ||||
-rw-r--r-- | chromeos/http/http_transport_curl.h (renamed from chromeos/http_transport_curl.h) | 8 | ||||
-rw-r--r-- | chromeos/http/http_transport_fake.cc (renamed from chromeos/http_transport_fake.cc) | 8 | ||||
-rw-r--r-- | chromeos/http/http_transport_fake.h (renamed from chromeos/http_transport_fake.h) | 10 | ||||
-rw-r--r-- | chromeos/http/http_utils.cc (renamed from chromeos/http_utils.cc) | 4 | ||||
-rw-r--r-- | chromeos/http/http_utils.h (renamed from chromeos/http_utils.h) | 10 | ||||
-rw-r--r-- | chromeos/http/http_utils_unittest.cc (renamed from chromeos/http_utils_unittest.cc) | 6 | ||||
-rw-r--r-- | chromeos/mime_utils.cc | 2 | ||||
-rw-r--r-- | chromeos/strings/string_utils.cc (renamed from chromeos/string_utils.cc) | 2 | ||||
-rw-r--r-- | chromeos/strings/string_utils.h (renamed from chromeos/string_utils.h) | 6 | ||||
-rw-r--r-- | chromeos/strings/string_utils_unittest.cc (renamed from chromeos/string_utils_unittest.cc) | 2 |
41 files changed, 112 insertions, 113 deletions
diff --git a/chromeos/data_encoding.cc b/chromeos/data_encoding.cc index 83e7a56..ba3fc1c 100644 --- a/chromeos/data_encoding.cc +++ b/chromeos/data_encoding.cc @@ -5,7 +5,7 @@ #include <chromeos/data_encoding.h> #include <base/strings/stringprintf.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include <cstring> namespace { diff --git a/chromeos/async_event_sequencer.cc b/chromeos/dbus/async_event_sequencer.cc index 8fc0a2e..33cf9ce 100644 --- a/chromeos/async_event_sequencer.cc +++ b/chromeos/dbus/async_event_sequencer.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 "chromeos/async_event_sequencer.h" +#include <chromeos/dbus/async_event_sequencer.h> namespace chromeos { diff --git a/chromeos/async_event_sequencer.h b/chromeos/dbus/async_event_sequencer.h index e20870b..089d305 100644 --- a/chromeos/async_event_sequencer.h +++ b/chromeos/dbus/async_event_sequencer.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 LIBCHROMEOS_CHROMEOS_ASYNC_EVENT_SEQUENCER_H_ -#define LIBCHROMEOS_CHROMEOS_ASYNC_EVENT_SEQUENCER_H_ +#ifndef LIBCHROMEOS_CHROMEOS_DBUS_ASYNC_EVENT_SEQUENCER_H_ +#define LIBCHROMEOS_CHROMEOS_DBUS_ASYNC_EVENT_SEQUENCER_H_ #include <set> #include <string> @@ -102,4 +102,4 @@ class AsyncEventSequencer : public base::RefCounted<AsyncEventSequencer> { } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_ASYNC_EVENT_SEQUENCER_H_ +#endif // LIBCHROMEOS_CHROMEOS_DBUS_ASYNC_EVENT_SEQUENCER_H_ diff --git a/chromeos/async_event_sequencer_unittest.cc b/chromeos/dbus/async_event_sequencer_unittest.cc index d5fcc84..49dcfb4 100644 --- a/chromeos/async_event_sequencer_unittest.cc +++ b/chromeos/dbus/async_event_sequencer_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 "chromeos/async_event_sequencer.h" +#include <chromeos/dbus/async_event_sequencer.h> #include <base/bind_helpers.h> #include <gmock/gmock.h> diff --git a/chromeos/dbus/dbus_object.cc b/chromeos/dbus/dbus_object.cc index fb6bb8b..97077f5 100644 --- a/chromeos/dbus/dbus_object.cc +++ b/chromeos/dbus/dbus_object.cc @@ -8,9 +8,9 @@ #include <base/bind.h> #include <base/logging.h> -#include <chromeos/async_event_sequencer.h> -#include <chromeos/exported_object_manager.h> -#include <chromeos/exported_property_set.h> +#include <chromeos/dbus/async_event_sequencer.h> +#include <chromeos/dbus/exported_object_manager.h> +#include <chromeos/dbus/exported_property_set.h> #include <dbus/property.h> namespace chromeos { diff --git a/chromeos/dbus/dbus_object.h b/chromeos/dbus/dbus_object.h index 93edd9c..6273665 100644 --- a/chromeos/dbus/dbus_object.h +++ b/chromeos/dbus/dbus_object.h @@ -52,10 +52,10 @@ class MyDbusObject { #include <base/basictypes.h> #include <base/bind.h> #include <base/memory/weak_ptr.h> -#include <chromeos/async_event_sequencer.h> +#include <chromeos/dbus/async_event_sequencer.h> #include <chromeos/dbus/dbus_object_internal_impl.h> -#include <chromeos/exported_property_set.h> -#include <chromeos/error.h> +#include <chromeos/dbus/exported_property_set.h> +#include <chromeos/errors/error.h> #include <dbus/bus.h> #include <dbus/exported_object.h> #include <dbus/message.h> diff --git a/chromeos/dbus/dbus_object_internal_impl.h b/chromeos/dbus/dbus_object_internal_impl.h index 1683daa..f5a8641 100644 --- a/chromeos/dbus/dbus_object_internal_impl.h +++ b/chromeos/dbus/dbus_object_internal_impl.h @@ -34,7 +34,7 @@ #include <chromeos/dbus/data_serialization.h> #include <chromeos/dbus/dbus_param_reader.h> #include <chromeos/dbus/utils.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> #include <dbus/message.h> namespace chromeos { diff --git a/chromeos/dbus/dbus_param_reader.h b/chromeos/dbus/dbus_param_reader.h index 92184f0..069f859 100644 --- a/chromeos/dbus/dbus_param_reader.h +++ b/chromeos/dbus/dbus_param_reader.h @@ -20,8 +20,8 @@ #include <chromeos/dbus/data_serialization.h> #include <chromeos/dbus/utils.h> -#include <chromeos/error.h> -#include <chromeos/error_codes.h> +#include <chromeos/errors/error.h> +#include <chromeos/errors/error_codes.h> #include <dbus/message.h> namespace chromeos { diff --git a/chromeos/exported_object_manager.cc b/chromeos/dbus/exported_object_manager.cc index 8034f8d..17ab4a1 100644 --- a/chromeos/exported_object_manager.cc +++ b/chromeos/dbus/exported_object_manager.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 "chromeos/exported_object_manager.h" +#include <chromeos/dbus/exported_object_manager.h> #include <vector> -#include <chromeos/async_event_sequencer.h> +#include <chromeos/dbus/async_event_sequencer.h> #include <chromeos/dbus/data_serialization.h> #include <dbus/object_manager.h> diff --git a/chromeos/exported_object_manager.h b/chromeos/dbus/exported_object_manager.h index ae13f2d..9fbec65 100644 --- a/chromeos/exported_object_manager.h +++ b/chromeos/dbus/exported_object_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 LIBCHROMEOS_CHROMEOS_EXPORTED_OBJECT_MANAGER_H_ -#define LIBCHROMEOS_CHROMEOS_EXPORTED_OBJECT_MANAGER_H_ +#ifndef LIBCHROMEOS_CHROMEOS_DBUS_EXPORTED_OBJECT_MANAGER_H_ +#define LIBCHROMEOS_CHROMEOS_DBUS_EXPORTED_OBJECT_MANAGER_H_ #include <map> #include <string> @@ -11,7 +11,7 @@ #include <base/memory/weak_ptr.h> #include <chromeos/any.h> #include <chromeos/dbus/dbus_object.h> -#include <chromeos/exported_property_set.h> +#include <chromeos/dbus/exported_property_set.h> #include <dbus/bus.h> #include <dbus/exported_object.h> #include <dbus/message.h> @@ -117,4 +117,4 @@ class ExportedObjectManager } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_EXPORTED_OBJECT_MANAGER_H_ +#endif // LIBCHROMEOS_CHROMEOS_DBUS_EXPORTED_OBJECT_MANAGER_H_ diff --git a/chromeos/exported_object_manager_unittest.cc b/chromeos/dbus/exported_object_manager_unittest.cc index 77bda29..32ecb37 100644 --- a/chromeos/exported_object_manager_unittest.cc +++ b/chromeos/dbus/exported_object_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 "chromeos/exported_object_manager.h" +#include <chromeos/dbus/exported_object_manager.h> #include <base/bind.h> #include <chromeos/dbus/utils.h> diff --git a/chromeos/exported_property_set.cc b/chromeos/dbus/exported_property_set.cc index 22cc54c..22315f6 100644 --- a/chromeos/exported_property_set.cc +++ b/chromeos/dbus/exported_property_set.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 "chromeos/exported_property_set.h" +#include <chromeos/dbus/exported_property_set.h> #include <base/bind.h> #include <dbus/bus.h> #include <dbus/property.h> // For kPropertyInterface -#include "chromeos/any.h" -#include "chromeos/async_event_sequencer.h" -#include "chromeos/dbus/dbus_object.h" -#include "chromeos/error_codes.h" +#include <chromeos/any.h> +#include <chromeos/dbus/async_event_sequencer.h> +#include <chromeos/dbus/dbus_object.h> +#include <chromeos/errors/error_codes.h> using chromeos::dbus_utils::AsyncEventSequencer; diff --git a/chromeos/exported_property_set.h b/chromeos/dbus/exported_property_set.h index 8eb06a4..ab95779 100644 --- a/chromeos/exported_property_set.h +++ b/chromeos/dbus/exported_property_set.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 LIBCHROMEOS_CHROMEOS_EXPORTED_PROPERTY_SET_H_ -#define LIBCHROMEOS_CHROMEOS_EXPORTED_PROPERTY_SET_H_ +#ifndef LIBCHROMEOS_CHROMEOS_DBUS_EXPORTED_PROPERTY_SET_H_ +#define LIBCHROMEOS_CHROMEOS_DBUS_EXPORTED_PROPERTY_SET_H_ #include <stdint.h> @@ -14,7 +14,7 @@ #include <base/memory/weak_ptr.h> #include <chromeos/any.h> #include <chromeos/dbus/data_serialization.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> #include <dbus/exported_object.h> #include <dbus/message.h> @@ -171,4 +171,4 @@ class ExportedProperty : public ExportedPropertyBase { } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_EXPORTED_PROPERTY_SET_H_ +#endif // LIBCHROMEOS_CHROMEOS_DBUS_EXPORTED_PROPERTY_SET_H_ diff --git a/chromeos/exported_property_set_unittest.cc b/chromeos/dbus/exported_property_set_unittest.cc index 744d4a6..db0d985 100644 --- a/chromeos/exported_property_set_unittest.cc +++ b/chromeos/dbus/exported_property_set_unittest.cc @@ -2,13 +2,14 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chromeos/exported_property_set.h" +#include <chromeos/dbus/exported_property_set.h> #include <string> #include <vector> #include <base/basictypes.h> #include <base/bind.h> +#include <chromeos/dbus/dbus_object.h> #include <dbus/message.h> #include <dbus/property.h> #include <dbus/object_path.h> @@ -17,8 +18,6 @@ #include <gmock/gmock.h> #include <gtest/gtest.h> -#include "chromeos/dbus/dbus_object.h" - using ::testing::AnyNumber; using ::testing::Return; using ::testing::Invoke; diff --git a/chromeos/dbus/mock_dbus_object.h b/chromeos/dbus/mock_dbus_object.h index fc53554..2f4d57e 100644 --- a/chromeos/dbus/mock_dbus_object.h +++ b/chromeos/dbus/mock_dbus_object.h @@ -7,7 +7,7 @@ #include <string> -#include <chromeos/async_event_sequencer.h> +#include <chromeos/dbus/async_event_sequencer.h> #include <chromeos/dbus/dbus_object.h> #include <gmock/gmock.h> diff --git a/chromeos/dbus/utils.cc b/chromeos/dbus/utils.cc index 1ea1578..d5fea72 100644 --- a/chromeos/dbus/utils.cc +++ b/chromeos/dbus/utils.cc @@ -7,7 +7,7 @@ #include <base/bind.h> #include <base/memory/scoped_ptr.h> #include <chromeos/any.h> -#include <chromeos/error_codes.h> +#include <chromeos/errors/error_codes.h> namespace chromeos { namespace dbus_utils { diff --git a/chromeos/dbus/utils.h b/chromeos/dbus/utils.h index ff092be..a4fb4df 100644 --- a/chromeos/dbus/utils.h +++ b/chromeos/dbus/utils.h @@ -8,7 +8,7 @@ #include <memory> #include <string> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> #include <dbus/exported_object.h> #include <dbus/message.h> diff --git a/chromeos/error.cc b/chromeos/errors/error.cc index 8ac0c98..869cd53 100644 --- a/chromeos/error.cc +++ b/chromeos/errors/error.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 "chromeos/error.h" +#include <chromeos/errors/error.h> #include <base/logging.h> #include <base/strings/stringprintf.h> diff --git a/chromeos/error.h b/chromeos/errors/error.h index df0f4e8..dd6b4ca 100644 --- a/chromeos/error.h +++ b/chromeos/errors/error.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 LIBCHROMEOS_CHROMEOS_ERROR_H_ -#define LIBCHROMEOS_CHROMEOS_ERROR_H_ +#ifndef LIBCHROMEOS_CHROMEOS_ERRORS_ERROR_H_ +#define LIBCHROMEOS_CHROMEOS_ERRORS_ERROR_H_ #include <memory> #include <string> @@ -77,4 +77,4 @@ class Error { } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_ERROR_H_ +#endif // LIBCHROMEOS_CHROMEOS_ERRORS_ERROR_H_ diff --git a/chromeos/error_codes.cc b/chromeos/errors/error_codes.cc index a954704..9e9db69 100644 --- a/chromeos/error_codes.cc +++ b/chromeos/errors/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 "chromeos/error_codes.h" +#include <chromeos/errors/error_codes.h> namespace chromeos { namespace errors { diff --git a/chromeos/error_codes.h b/chromeos/errors/error_codes.h index da2a0be..5a00a2c 100644 --- a/chromeos/error_codes.h +++ b/chromeos/errors/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 LIBCHROMEOS_CHROMEOS_ERROR_CODES_H_ -#define LIBCHROMEOS_CHROMEOS_ERROR_CODES_H_ +#ifndef LIBCHROMEOS_CHROMEOS_ERRORS_ERROR_CODES_H_ +#define LIBCHROMEOS_CHROMEOS_ERRORS_ERROR_CODES_H_ namespace chromeos { namespace errors { @@ -26,4 +26,4 @@ extern const char kFileReadError[]; } // namespace errors } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_ERROR_CODES_H_ +#endif // LIBCHROMEOS_CHROMEOS_ERRORS_ERROR_CODES_H_ diff --git a/chromeos/error_unittest.cc b/chromeos/errors/error_unittest.cc index 2fcd10c..39104af 100644 --- a/chromeos/error_unittest.cc +++ b/chromeos/errors/error_unittest.cc @@ -5,7 +5,7 @@ #include <base/files/file_path.h> #include <gtest/gtest.h> -#include "chromeos/error.h" +#include <chromeos/errors/error.h> using chromeos::Error; diff --git a/chromeos/http_connection.h b/chromeos/http/http_connection.h index 2bced1b..bf800e6 100644 --- a/chromeos/http_connection.h +++ b/chromeos/http/http_connection.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_H_ #include <string> #include <vector> #include <base/basictypes.h> -#include <chromeos/error.h> -#include <chromeos/http_transport.h> +#include <chromeos/errors/error.h> +#include <chromeos/http/http_transport.h> namespace chromeos { namespace http { @@ -83,4 +83,4 @@ class Connection { } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_H_ diff --git a/chromeos/http_connection_curl.cc b/chromeos/http/http_connection_curl.cc index 0336982..12f631a 100644 --- a/chromeos/http_connection_curl.cc +++ b/chromeos/http/http_connection_curl.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 <chromeos/http_connection_curl.h> +#include <chromeos/http/http_connection_curl.h> #include <base/logging.h> -#include <chromeos/http_request.h> -#include <chromeos/http_transport_curl.h> -#include <chromeos/string_utils.h> +#include <chromeos/http/http_request.h> +#include <chromeos/http/http_transport_curl.h> +#include <chromeos/strings/string_utils.h> namespace chromeos { namespace http { diff --git a/chromeos/http_connection_curl.h b/chromeos/http/http_connection_curl.h index 51cd6f3..5e975d3 100644 --- a/chromeos/http_connection_curl.h +++ b/chromeos/http/http_connection_curl.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_CURL_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_CURL_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_CURL_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_CURL_H_ #include <map> #include <string> #include <vector> #include <base/basictypes.h> -#include <chromeos/http_connection.h> +#include <chromeos/http/http_connection.h> #include <curl/curl.h> namespace chromeos { @@ -82,4 +82,4 @@ class Connection : public http::Connection { } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_CURL_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_CURL_H_ diff --git a/chromeos/http_connection_fake.cc b/chromeos/http/http_connection_fake.cc index 4b065fd..48d6419 100644 --- a/chromeos/http_connection_fake.cc +++ b/chromeos/http/http_connection_fake.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 <chromeos/http_connection_fake.h> +#include <chromeos/http/http_connection_fake.h> #include <base/logging.h> -#include <chromeos/http_request.h> +#include <chromeos/http/http_request.h> #include <chromeos/mime_utils.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> namespace chromeos { namespace http { diff --git a/chromeos/http_connection_fake.h b/chromeos/http/http_connection_fake.h index 74a90d3..d0a07a9 100644 --- a/chromeos/http_connection_fake.h +++ b/chromeos/http/http_connection_fake.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 LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_FAKE_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_FAKE_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_FAKE_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_FAKE_H_ #include <map> #include <string> #include <vector> #include <base/basictypes.h> -#include <chromeos/http_connection.h> -#include <chromeos/http_transport_fake.h> +#include <chromeos/http/http_connection.h> +#include <chromeos/http/http_transport_fake.h> namespace chromeos { namespace http { @@ -58,4 +58,4 @@ class Connection : public http::Connection { } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_CONNECTION_FAKE_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_CONNECTION_FAKE_H_ diff --git a/chromeos/http_request.cc b/chromeos/http/http_request.cc index debf34f..a1e3ddd 100644 --- a/chromeos/http_request.cc +++ b/chromeos/http/http_request.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 <chromeos/http_request.h> +#include <chromeos/http/http_request.h> #include <base/logging.h> -#include <chromeos/http_connection_curl.h> -#include <chromeos/http_transport_curl.h> +#include <chromeos/http/http_connection_curl.h> +#include <chromeos/http/http_transport_curl.h> #include <chromeos/map_utils.h> #include <chromeos/mime_utils.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> namespace chromeos { namespace http { diff --git a/chromeos/http_request.h b/chromeos/http/http_request.h index 7c0e4b6..e74f32a 100644 --- a/chromeos/http_request.h +++ b/chromeos/http/http_request.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 LIBCHROMEOS_CHROMEOS_HTTP_REQUEST_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_REQUEST_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_REQUEST_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_REQUEST_H_ #include <limits> #include <map> @@ -13,9 +13,9 @@ #include <vector> #include <base/basictypes.h> -#include <chromeos/error.h> -#include <chromeos/http_connection.h> -#include <chromeos/http_transport.h> +#include <chromeos/errors/error.h> +#include <chromeos/http/http_connection.h> +#include <chromeos/http/http_transport.h> namespace chromeos { namespace http { @@ -348,4 +348,4 @@ class Response { } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_REQUEST_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_REQUEST_H_ diff --git a/chromeos/http_transport.h b/chromeos/http/http_transport.h index c283b2e..e50bb97 100644 --- a/chromeos/http_transport.h +++ b/chromeos/http/http_transport.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 LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_H_ #include <memory> #include <string> @@ -11,7 +11,7 @@ #include <vector> #include <base/basictypes.h> -#include <chromeos/error.h> +#include <chromeos/errors/error.h> namespace chromeos { namespace http { @@ -50,4 +50,4 @@ class Transport { } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_H_ diff --git a/chromeos/http_transport_curl.cc b/chromeos/http/http_transport_curl.cc index c424097..121c22b 100644 --- a/chromeos/http_transport_curl.cc +++ b/chromeos/http/http_transport_curl.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 <chromeos/http_transport_curl.h> +#include <chromeos/http/http_transport_curl.h> #include <base/logging.h> -#include <chromeos/http_connection_curl.h> -#include <chromeos/http_request.h> +#include <chromeos/http/http_connection_curl.h> +#include <chromeos/http/http_request.h> namespace chromeos { namespace http { diff --git a/chromeos/http_transport_curl.h b/chromeos/http/http_transport_curl.h index be30a85..381a9ca 100644 --- a/chromeos/http_transport_curl.h +++ b/chromeos/http/http_transport_curl.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 LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_CURL_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_CURL_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_CURL_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_CURL_H_ #include <string> -#include <chromeos/http_transport.h> +#include <chromeos/http/http_transport.h> namespace chromeos { namespace http { @@ -44,4 +44,4 @@ class Transport : public http::Transport { } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_CURL_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_CURL_H_ diff --git a/chromeos/http_transport_fake.cc b/chromeos/http/http_transport_fake.cc index 637e6ea..af4b8e1 100644 --- a/chromeos/http_transport_fake.cc +++ b/chromeos/http/http_transport_fake.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 <chromeos/http_transport_fake.h> +#include <chromeos/http/http_transport_fake.h> #include <utility> @@ -10,10 +10,10 @@ #include <base/json/json_writer.h> #include <base/logging.h> #include <chromeos/bind_lambda.h> -#include <chromeos/http_connection_fake.h> -#include <chromeos/http_request.h> +#include <chromeos/http/http_connection_fake.h> +#include <chromeos/http/http_request.h> #include <chromeos/mime_utils.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include <chromeos/url_utils.h> namespace chromeos { diff --git a/chromeos/http_transport_fake.h b/chromeos/http/http_transport_fake.h index 5ae92dc..8a713c9 100644 --- a/chromeos/http_transport_fake.h +++ b/chromeos/http/http_transport_fake.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 LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_FAKE_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_FAKE_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_FAKE_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_FAKE_H_ #include <map> #include <string> @@ -12,8 +12,8 @@ #include <base/callback.h> #include <base/values.h> -#include <chromeos/http_transport.h> -#include <chromeos/http_utils.h> +#include <chromeos/http/http_transport.h> +#include <chromeos/http/http_utils.h> namespace chromeos { namespace http { @@ -219,4 +219,4 @@ class ServerResponse : public ServerRequestResponseBase { } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_TRANSPORT_FAKE_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_TRANSPORT_FAKE_H_ diff --git a/chromeos/http_utils.cc b/chromeos/http/http_utils.cc index e805f4a..b5391d9 100644 --- a/chromeos/http_utils.cc +++ b/chromeos/http/http_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 <chromeos/http_utils.h> +#include <chromeos/http/http_utils.h> #include <algorithm> @@ -10,7 +10,7 @@ #include <base/json/json_writer.h> #include <base/values.h> #include <chromeos/data_encoding.h> -#include <chromeos/error_codes.h> +#include <chromeos/errors/error_codes.h> #include <chromeos/mime_utils.h> using chromeos::mime::AppendParameter; diff --git a/chromeos/http_utils.h b/chromeos/http/http_utils.h index dd53ecf..051fe49 100644 --- a/chromeos/http_utils.h +++ b/chromeos/http/http_utils.h @@ -2,15 +2,15 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef LIBCHROMEOS_CHROMEOS_HTTP_UTILS_H_ -#define LIBCHROMEOS_CHROMEOS_HTTP_UTILS_H_ +#ifndef LIBCHROMEOS_CHROMEOS_HTTP_HTTP_UTILS_H_ +#define LIBCHROMEOS_CHROMEOS_HTTP_HTTP_UTILS_H_ #include <string> #include <utility> #include <vector> -#include <chromeos/error.h> -#include <chromeos/http_request.h> +#include <chromeos/errors/error.h> +#include <chromeos/http/http_request.h> namespace base { class Value; @@ -176,4 +176,4 @@ std::unique_ptr<base::DictionaryValue> ParseJsonResponse( } // namespace http } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_HTTP_UTILS_H_ +#endif // LIBCHROMEOS_CHROMEOS_HTTP_HTTP_UTILS_H_ diff --git a/chromeos/http_utils_unittest.cc b/chromeos/http/http_utils_unittest.cc index 8b64efb..0e22da3 100644 --- a/chromeos/http_utils_unittest.cc +++ b/chromeos/http/http_utils_unittest.cc @@ -7,10 +7,10 @@ #include <base/values.h> #include <chromeos/bind_lambda.h> -#include <chromeos/http_transport_fake.h> -#include <chromeos/http_utils.h> +#include <chromeos/http/http_transport_fake.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 <gtest/gtest.h> diff --git a/chromeos/mime_utils.cc b/chromeos/mime_utils.cc index 6e19ae6..08f7baf 100644 --- a/chromeos/mime_utils.cc +++ b/chromeos/mime_utils.cc @@ -6,7 +6,7 @@ #include <algorithm> #include <base/strings/string_util.h> -#include <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> namespace chromeos { diff --git a/chromeos/string_utils.cc b/chromeos/strings/string_utils.cc index c3e590d..fa7aba3 100644 --- a/chromeos/string_utils.cc +++ b/chromeos/strings/string_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 <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include <algorithm> #include <string.h> diff --git a/chromeos/string_utils.h b/chromeos/strings/string_utils.h index d7d301f..d5a9995 100644 --- a/chromeos/string_utils.h +++ b/chromeos/strings/string_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 LIBCHROMEOS_CHROMEOS_STRING_UTILS_H_ -#define LIBCHROMEOS_CHROMEOS_STRING_UTILS_H_ +#ifndef LIBCHROMEOS_CHROMEOS_STRINGS_STRING_UTILS_H_ +#define LIBCHROMEOS_CHROMEOS_STRINGS_STRING_UTILS_H_ #include <string> #include <utility> @@ -53,4 +53,4 @@ std::string ToString(bool value); } // namespace string_utils } // namespace chromeos -#endif // LIBCHROMEOS_CHROMEOS_STRING_UTILS_H_ +#endif // LIBCHROMEOS_CHROMEOS_STRINGS_STRING_UTILS_H_ diff --git a/chromeos/string_utils_unittest.cc b/chromeos/strings/string_utils_unittest.cc index 366094b..0842019 100644 --- a/chromeos/string_utils_unittest.cc +++ b/chromeos/strings/string_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 <chromeos/string_utils.h> +#include <chromeos/strings/string_utils.h> #include <gtest/gtest.h> |