Mojo: Move mojo/public/utility to mojo/public/cpp/utility.

R=sky@chromium.org

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

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

mojo/examples/sample_app/sample_app.cc

@@ -10,11 +10,11 @@
 #include "mojo/public/bindings/remote_ptr.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"
-#include "mojo/public/utility/run_loop.h"
 #include "mojo/services/native_viewport/native_viewport.mojom.h"
 
 #if defined(WIN32)

mojo/mojo_public.gypi

@@ -212,16 +212,16 @@
         'mojo_utility',
       ],
       'sources': [
-        'public/utility/tests/mutex_unittest.cc',
-        'public/utility/tests/run_loop_unittest.cc',
-        'public/utility/tests/thread_unittest.cc',
+        'public/cpp/tests/utility/mutex_unittest.cc',
+        'public/cpp/tests/utility/run_loop_unittest.cc',
+        'public/cpp/tests/utility/thread_unittest.cc',
       ],
       'conditions': [
         # See crbug.com/342893:
         ['OS=="win"', {
           'sources!': [
-            'public/utility/tests/mutex_unittest.cc',
-            'public/utility/tests/thread_unittest.cc',
+            'public/cpp/tests/utility/mutex_unittest.cc',
+            'public/cpp/tests/utility/thread_unittest.cc',
           ],
         }],
       ],
@@ -330,25 +330,25 @@
       'target_name': 'mojo_utility',
       'type': 'static_library',
       'sources': [
-        'public/utility/mutex.h',
-        'public/utility/run_loop.h',
-        'public/utility/run_loop_handler.h',
-        'public/utility/thread.h',
-        'public/utility/lib/mutex.cc',
-        'public/utility/lib/run_loop.cc',
-        'public/utility/lib/thread.cc',
-        'public/utility/lib/thread_local.h',
-        'public/utility/lib/thread_local_posix.cc',
-        'public/utility/lib/thread_local_win.cc',
+        'public/cpp/utility/mutex.h',
+        'public/cpp/utility/run_loop.h',
+        'public/cpp/utility/run_loop_handler.h',
+        'public/cpp/utility/thread.h',
+        'public/cpp/utility/lib/mutex.cc',
+        'public/cpp/utility/lib/run_loop.cc',
+        'public/cpp/utility/lib/thread.cc',
+        'public/cpp/utility/lib/thread_local.h',
+        'public/cpp/utility/lib/thread_local_posix.cc',
+        'public/cpp/utility/lib/thread_local_win.cc',
       ],
       'conditions': [
         # See crbug.com/342893:
         ['OS=="win"', {
           'sources!': [
-            'public/utility/mutex.h',
-            'public/utility/thread.h',
-            'public/utility/lib/mutex.cc',
-            'public/utility/lib/thread.cc',
+            'public/cpp/utility/mutex.h',
+            'public/cpp/utility/thread.h',
+            'public/cpp/utility/lib/mutex.cc',
+            'public/cpp/utility/lib/thread.cc',
           ],
         }],
       ],

mojo/public/bindings/tests/connector_unittest.cc

@@ -9,8 +9,8 @@
 #include "mojo/public/bindings/lib/message_builder.h"
 #include "mojo/public/bindings/lib/message_queue.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/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/handle_passing_unittest.cc

@@ -5,9 +5,9 @@
 #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/utility/run_loop.h"
 #include "mojo/public/environment/environment.h"
 #include "mojo/public/tests/test_utils.h"
-#include "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

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/utility/run_loop.h"
 #include "mojo/public/environment/environment.h"
-#include "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/request_response_unittest.cc

@@ -6,9 +6,9 @@
 #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/utility/run_loop.h"
 #include "mojo/public/environment/environment.h"
 #include "mojo/public/tests/test_utils.h"
-#include "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/bindings/tests/router_unittest.cc

@@ -9,8 +9,8 @@
 #include "mojo/public/bindings/lib/message_queue.h"
 #include "mojo/public/bindings/lib/router.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/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/c/tests/DEPS

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

mojo/public/c/tests/system/core_perftest.cc

@@ -19,7 +19,7 @@
 // TODO(vtl): (here and below) crbug.com/342893
 #if !defined(WIN32)
 #include <time.h>
-#include "mojo/public/utility/thread.h"
+#include "mojo/public/cpp/utility/thread.h"
 #endif  // !defined(WIN32)
 
 namespace {

mojo/public/utility/tests/mutex_unittest.cc → mojo/public/cpp/tests/utility/mutex_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 "mojo/public/utility/mutex.h"
+#include "mojo/public/cpp/utility/mutex.h"
 
 #include <stdlib.h>  // For |rand()|.
 #include <time.h>  // For |nanosleep()| (defined by POSIX).
@@ -10,7 +10,7 @@
 #include <vector>
 
 #include "mojo/public/cpp/system/macros.h"
-#include "mojo/public/utility/thread.h"
+#include "mojo/public/cpp/utility/thread.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/utility/tests/run_loop_unittest.cc → mojo/public/cpp/tests/utility/run_loop_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 "mojo/public/utility/run_loop.h"
+#include "mojo/public/cpp/utility/run_loop.h"
 
 #include <string>
 
 #include "mojo/public/cpp/system/core.h"
+#include "mojo/public/cpp/utility/run_loop_handler.h"
 #include "mojo/public/tests/test_utils.h"
-#include "mojo/public/utility/run_loop_handler.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/utility/tests/thread_unittest.cc → mojo/public/cpp/tests/utility/thread_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 "mojo/public/utility/thread.h"
+#include "mojo/public/cpp/utility/thread.h"
 
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"

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

mojo/public/utility/lib/run_loop.cc → mojo/public/cpp/utility/lib/run_loop.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 "mojo/public/utility/run_loop.h"
+#include "mojo/public/cpp/utility/run_loop.h"
 
 #include <assert.h>
 
 #include <algorithm>
 #include <vector>
 
-#include "mojo/public/utility/lib/thread_local.h"
-#include "mojo/public/utility/run_loop_handler.h"
+#include "mojo/public/cpp/utility/lib/thread_local.h"
+#include "mojo/public/cpp/utility/run_loop_handler.h"
 
 namespace mojo {
 namespace {

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

mojo/public/utility/lib/thread_local.h → mojo/public/cpp/utility/lib/thread_local.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_UTILITY_LIB_THREAD_LOCAL_H_
-#define MOJO_PUBLIC_UTILITY_LIB_THREAD_LOCAL_H_
+#ifndef MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_
+#define MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_
 
 #ifndef _WIN32
 #include <pthread.h>
@@ -58,4 +58,4 @@ class ThreadLocalPointer {
 }  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_UTILITY_LIB_THREAD_LOCAL_H_
+#endif  // MOJO_PUBLIC_CPP_UTILITY_LIB_THREAD_LOCAL_H_

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

mojo/public/utility/lib/thread_local_win.cc → mojo/public/cpp/utility/lib/thread_local_win.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/utility/lib/thread_local.h"
+#include "mojo/public/cpp/utility/lib/thread_local.h"
 
 #include <assert.h>
 #include <windows.h>

mojo/public/utility/mutex.h → mojo/public/cpp/utility/mutex.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_UTILITY_MUTEX_H_
-#define MOJO_PUBLIC_UTILITY_MUTEX_H_
+#ifndef MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_
+#define MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_
 
 #ifdef _WIN32
 #error "Not implemented: See crbug.com/342893."
@@ -67,4 +67,4 @@ class MutexLock {
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_UTILITY_MUTEX_H_
+#endif  // MOJO_PUBLIC_CPP_UTILITY_MUTEX_H_

mojo/public/utility/run_loop.h → mojo/public/cpp/utility/run_loop.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_UTILITY_RUN_LOOP_H_
-#define MOJO_PUBLIC_UTILITY_RUN_LOOP_H_
+#ifndef MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_
+#define MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_
 
 #include <map>
 
@@ -105,4 +105,4 @@ class RunLoop {
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_UTILITY_RUN_LOOP_H_
+#endif  // MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_H_

mojo/public/utility/run_loop_handler.h → mojo/public/cpp/utility/run_loop_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 MOJO_PUBLIC_UTILITY_RUN_LOOP_HANDLER_H_
-#define MOJO_PUBLIC_UTILITY_RUN_LOOP_HANDLER_H_
+#ifndef MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_
+#define MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_
 
 #include "mojo/public/cpp/system/core.h"
 
@@ -22,4 +22,4 @@ class RunLoopHandler {
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_UTILITY_RUN_LOOP_HANDLER_H_
+#endif  // MOJO_PUBLIC_CPP_UTILITY_RUN_LOOP_HANDLER_H_

mojo/public/utility/thread.h → mojo/public/cpp/utility/thread.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_UTILITY_THREAD_H_
-#define MOJO_PUBLIC_UTILITY_THREAD_H_
+#ifndef MOJO_PUBLIC_CPP_UTILITY_THREAD_H_
+#define MOJO_PUBLIC_CPP_UTILITY_THREAD_H_
 
 #ifdef _WIN32
 #error "Not implemented: See crbug.com/342893."
@@ -59,4 +59,4 @@ class Thread {
 
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_UTILITY_THREAD_H_
+#endif  // MOJO_PUBLIC_CPP_UTILITY_THREAD_H_

mojo/public/environment/lib/DEPS

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

mojo/public/environment/lib/buffer_tls.cc

@@ -6,8 +6,8 @@
 
 #include <assert.h>
 
+#include "mojo/public/cpp/utility/lib/thread_local.h"
 #include "mojo/public/environment/lib/buffer_tls_setup.h"
-#include "mojo/public/utility/lib/thread_local.h"
 
 namespace mojo {
 namespace internal {

mojo/public/environment/lib/default_async_waiter.cc

@@ -6,8 +6,8 @@
 
 #include <assert.h>
 
-#include "mojo/public/utility/run_loop.h"
-#include "mojo/public/utility/run_loop_handler.h"
+#include "mojo/public/cpp/utility/run_loop.h"
+#include "mojo/public/cpp/utility/run_loop_handler.h"
 
 namespace mojo {
 namespace {

mojo/public/environment/lib/environment.cc

@@ -4,8 +4,8 @@
 
 #include "mojo/public/environment/environment.h"
 
+#include "mojo/public/cpp/utility/run_loop.h"
 #include "mojo/public/environment/lib/buffer_tls_setup.h"
-#include "mojo/public/utility/run_loop.h"
 
 namespace mojo {
 

mojo/public/environment/tests/async_waiter_unittest.cc

@@ -6,10 +6,10 @@
 
 #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 "mojo/public/utility/run_loop.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {

mojo/public/utility/DEPS

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