Mojo: Move public/environment to public/cpp/environment.

R=darin@chromium.org

Review URL: https://codereview.chromium.org/218043002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260362 0039d316-1c4b-4281-b951-d872f2087c98

mojo/bindings/js/support.cc

@@ -14,8 +14,8 @@
 #include "gin/wrappable.h"
 #include "mojo/bindings/js/handle.h"
 #include "mojo/bindings/js/waiting_callback.h"
+#include "mojo/public/cpp/environment/default_async_waiter.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/environment/default_async_waiter.h"
 
 namespace mojo {
 namespace js {

mojo/environment/async_waiter_impl.h

@@ -5,8 +5,8 @@
 #ifndef MOJO_ENVIRONMENT_ASYNC_WAITER_IMPL_H_
 #define MOJO_ENVIRONMENT_ASYNC_WAITER_IMPL_H_
 
-#include "mojo/public/environment/async_waiter.h"
 #include "mojo/environment/mojo_environment_impl_export.h"
+#include "mojo/public/cpp/environment/async_waiter.h"
 
 namespace mojo {
 namespace internal {

mojo/environment/buffer_tls.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 "mojo/public/environment/buffer_tls.h"
+#include "mojo/public/cpp/environment/buffer_tls.h"
 
 #include "mojo/environment/buffer_tls_impl.h"
 

mojo/environment/default_async_waiter.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 "mojo/public/environment/default_async_waiter.h"
+#include "mojo/public/cpp/environment/default_async_waiter.h"
 
 #include "mojo/environment/default_async_waiter_impl.h"
 

mojo/environment/environment.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 "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
 
 namespace mojo {
 

mojo/examples/pepper_container_app/pepper_container_app.cc

@@ -13,8 +13,8 @@
 #include "mojo/examples/pepper_container_app/type_converters.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
-#include "mojo/public/c/system/core.h"
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
+#include "mojo/public/cpp/system/core.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"

mojo/examples/sample_app/sample_app.cc

@@ -8,10 +8,10 @@
 #include "mojo/examples/sample_app/gles2_client_impl.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/environment.h"
 #include "mojo/public/gles2/gles2_cpp.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"

mojo/mojo_public.gypi

@@ -177,7 +177,7 @@
         'mojo_utility',
       ],
       'sources': [
-        'public/environment/tests/async_waiter_unittest.cc',
+        'public/cpp/environment/tests/async_waiter_unittest.cc',
       ],
     },
     {
@@ -314,13 +314,13 @@
       'target_name': 'mojo_environment_standalone',
       'type': 'static_library',
       'sources': [
-        'public/environment/buffer_tls.h',
-        'public/environment/default_async_waiter.h',
-        'public/environment/environment.h',
-        'public/environment/lib/default_async_waiter.cc',
-        'public/environment/lib/buffer_tls.cc',
-        'public/environment/lib/buffer_tls_setup.h',
-        'public/environment/lib/environment.cc',
+        'public/cpp/environment/buffer_tls.h',
+        'public/cpp/environment/default_async_waiter.h',
+        'public/cpp/environment/environment.h',
+        'public/cpp/environment/lib/default_async_waiter.cc',
+        'public/cpp/environment/lib/buffer_tls.cc',
+        'public/cpp/environment/lib/buffer_tls_setup.h',
+        'public/cpp/environment/lib/environment.cc',
       ],
       'include_dirs': [
         '..',

mojo/public/bindings/lib/DEPS

 include_rules = [
-  "-mojo"
-  "+mojo/public/environment"
-  "+mojo/public/system"
+  "-mojo",
+  "+mojo/public/bindings",
+  "+mojo/public/cpp/environment",
+  "+mojo/public/cpp/system",
 ]

mojo/public/bindings/lib/buffer.cc

@@ -6,8 +6,8 @@
 
 #include <assert.h>
 
+#include "mojo/public/cpp/environment/buffer_tls.h"
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/public/environment/buffer_tls.h"
 
 namespace mojo {
 

mojo/public/bindings/lib/connector.h

@@ -7,8 +7,8 @@
 
 #include "mojo/public/bindings/lib/message_queue.h"
 #include "mojo/public/bindings/message.h"
+#include "mojo/public/cpp/environment/default_async_waiter.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/environment/default_async_waiter.h"
 
 namespace mojo {
 class ErrorHandler;

mojo/public/bindings/tests/array_unittest.cc

@@ -6,7 +6,7 @@
 #include "mojo/public/bindings/array.h"
 #include "mojo/public/bindings/lib/fixed_buffer.h"
 #include "mojo/public/bindings/lib/scratch_buffer.h"
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/buffer_unittest.cc

@@ -8,7 +8,7 @@
 #include "mojo/public/bindings/lib/bindings_serialization.h"
 #include "mojo/public/bindings/lib/fixed_buffer.h"
 #include "mojo/public/bindings/lib/scratch_buffer.h"
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/connector_unittest.cc

@@ -8,9 +8,9 @@
 #include "mojo/public/bindings/lib/connector.h"
 #include "mojo/public/bindings/lib/message_builder.h"
 #include "mojo/public/bindings/lib/message_queue.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/handle_passing_unittest.cc

@@ -5,8 +5,8 @@
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
 #include "mojo/public/bindings/tests/sample_factory.mojom.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/environment.h"
 #include "mojo/public/tests/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

mojo/public/bindings/tests/remote_ptr_unittest.cc

@@ -6,8 +6,8 @@
 #include "mojo/public/bindings/remote_ptr.h"
 #include "mojo/public/bindings/tests/math_calculator.mojom.h"
 #include "mojo/public/bindings/tests/sample_service.mojom.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/request_response_unittest.cc

@@ -6,8 +6,8 @@
 #include "mojo/public/bindings/remote_ptr.h"
 #include "mojo/public/bindings/tests/sample_import.mojom.h"
 #include "mojo/public/bindings/tests/sample_interfaces.mojom.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/environment.h"
 #include "mojo/public/tests/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

mojo/public/bindings/tests/router_unittest.cc

@@ -8,9 +8,9 @@
 #include "mojo/public/bindings/lib/message_builder.h"
 #include "mojo/public/bindings/lib/message_queue.h"
 #include "mojo/public/bindings/lib/router.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/sample_service_unittest.cc

@@ -8,7 +8,7 @@
 
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/tests/sample_service.mojom.h"
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/type_conversion_unittest.cc

@@ -4,7 +4,7 @@
 
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/tests/test_structs.mojom.h"
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/environment/buffer_tls.h → mojo/public/cpp/environment/buffer_tls.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 MOJO_PUBLIC_ENVIRONMENT_BUFFER_TLS_H_
-#define MOJO_PUBLIC_ENVIRONMENT_BUFFER_TLS_H_
+#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_BUFFER_TLS_H_
+#define MOJO_PUBLIC_CPP_ENVIRONMENT_BUFFER_TLS_H_
 
 namespace mojo {
 class Buffer;
@@ -17,4 +17,4 @@ Buffer* SetCurrentBuffer(Buffer* buffer);
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_ENVIRONMENT_BUFFER_TLS_H_
+#endif  // MOJO_PUBLIC_CPP_ENVIRONMENT_BUFFER_TLS_H_

mojo/public/environment/default_async_waiter.h → mojo/public/cpp/environment/default_async_waiter.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 MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_
-#define MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_
+#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_
+#define MOJO_PUBLIC_CPP_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_
 
 #include "mojo/public/c/system/async_waiter.h"
 
@@ -14,4 +14,4 @@ MojoAsyncWaiter* GetDefaultAsyncWaiter();
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_
+#endif  // MOJO_PUBLIC_CPP_ENVIRONMENT_DEFAULT_ASYNC_WAITER_H_

mojo/public/environment/environment.h → mojo/public/cpp/environment/environment.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 MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_
-#define MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_
+#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_
+#define MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_
 
 #include "mojo/public/cpp/system/macros.h"
 
@@ -21,4 +21,4 @@ class Environment {
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_ENVIRONMENT_ENVIRONMENT_H_
+#endif  // MOJO_PUBLIC_CPP_ENVIRONMENT_ENVIRONMENT_H_

mojo/public/cpp/environment/lib/DEPS

+include_rules = [
+  "+mojo/public/cpp/environment",
+  "+mojo/public/cpp/utility",
+]

mojo/public/environment/lib/buffer_tls.cc → mojo/public/cpp/environment/lib/buffer_tls.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 "mojo/public/environment/buffer_tls.h"
+#include "mojo/public/cpp/environment/buffer_tls.h"
 
 #include <assert.h>
 
+#include "mojo/public/cpp/environment/lib/buffer_tls_setup.h"
 #include "mojo/public/cpp/utility/lib/thread_local.h"
-#include "mojo/public/environment/lib/buffer_tls_setup.h"
 
 namespace mojo {
 namespace internal {

mojo/public/environment/lib/buffer_tls_setup.h → mojo/public/cpp/environment/lib/buffer_tls_setup.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 MOJO_PUBLIC_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_
-#define MOJO_PUBLIC_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_
+#ifndef MOJO_PUBLIC_CPP_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_
+#define MOJO_PUBLIC_CPP_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_
 
 namespace mojo {
 namespace internal {
@@ -14,4 +14,4 @@ void TearDownCurrentBuffer();
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_
+#endif  // MOJO_PUBLIC_CPP_ENVIRONMENT_STANDALONE_BUFFER_TLS_SETUP_H_

mojo/public/environment/lib/default_async_waiter.cc → mojo/public/cpp/environment/lib/default_async_waiter.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 "mojo/public/environment/default_async_waiter.h"
+#include "mojo/public/cpp/environment/default_async_waiter.h"
 
 #include <assert.h>
 

mojo/public/environment/lib/environment.cc → mojo/public/cpp/environment/lib/environment.cc

@@ -2,10 +2,10 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
 
+#include "mojo/public/cpp/environment/lib/buffer_tls_setup.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/lib/buffer_tls_setup.h"
 
 namespace mojo {
 

mojo/public/cpp/environment/tests/DEPS

+include_rules = [
+  "+testing",
+  "+mojo/public/cpp/utility",
+  # TODO(vtl): Temporary until these are moved to mojo/public/cpp:
+  "+mojo/public/tests",
+]

mojo/public/environment/tests/async_waiter_unittest.cc → mojo/public/cpp/environment/tests/async_waiter_unittest.cc

@@ -4,11 +4,11 @@
 
 #include <string>
 
+#include "mojo/public/cpp/environment/default_async_waiter.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/cpp/system/core.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "mojo/public/cpp/utility/run_loop.h"
-#include "mojo/public/environment/default_async_waiter.h"
-#include "mojo/public/environment/environment.h"
 #include "mojo/public/tests/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 

mojo/public/environment/DEPS

-include_rules = [
-  "-mojo/public"
-  "+mojo/public/system"
-]

mojo/public/environment/lib/DEPS

-include_rules = [
-  "+mojo/public/environment"
-  "+mojo/public/cpp/utility"
-]

mojo/public/gles2/gles2_cpp.h

@@ -5,7 +5,7 @@
 #ifndef MOJO_PUBLIC_GLES2_GLES2_CPP_H_
 #define MOJO_PUBLIC_GLES2_GLES2_CPP_H_
 
-#include "mojo/public/environment/default_async_waiter.h"
+#include "mojo/public/cpp/environment/default_async_waiter.h"
 #include "mojo/public/gles2/gles2.h"
 
 namespace mojo {

mojo/service_manager/service_manager_unittest.cc

@@ -5,7 +5,7 @@
 #include "base/message_loop/message_loop.h"
 #include "mojo/public/bindings/allocation_scope.h"
 #include "mojo/public/bindings/remote_ptr.h"
-#include "mojo/public/environment/environment.h"
+#include "mojo/public/cpp/environment/environment.h"
 #include "mojo/public/shell/application.h"
 #include "mojo/public/shell/shell.mojom.h"
 #include "mojo/service_manager/service_loader.h"