Remove deprecated headers from mojo/public/{c,cpp}/system.
R=vardhan@google.com
Review URL: https://codereview.chromium.org/1827193002 .
diff --git a/mojo/public/c/system/BUILD.gn b/mojo/public/c/system/BUILD.gn
index 0e728f5..93b84b4 100644
--- a/mojo/public/c/system/BUILD.gn
+++ b/mojo/public/c/system/BUILD.gn
@@ -10,15 +10,12 @@
mojo_sdk_source_set("system") {
sources = [
"buffer.h",
- "core.h",
"data_pipe.h",
- "functions.h",
"handle.h",
"macros.h",
"message_pipe.h",
"result.h",
"time.h",
- "types.h",
"wait.h",
]
}
diff --git a/mojo/public/c/system/core.h b/mojo/public/c/system/core.h
deleted file mode 100644
index 186b6da..0000000
--- a/mojo/public/c/system/core.h
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// DEPRECATED -- do not use: include individual header files instead.
-//
-// TODO(vtl): Delete this header file.
-//
-// Note: This header should be compilable as C.
-
-#ifndef MOJO_PUBLIC_C_SYSTEM_CORE_H_
-#define MOJO_PUBLIC_C_SYSTEM_CORE_H_
-
-#include "mojo/public/c/system/buffer.h"
-#include "mojo/public/c/system/data_pipe.h"
-#include "mojo/public/c/system/handle.h"
-#include "mojo/public/c/system/macros.h"
-#include "mojo/public/c/system/main.h"
-#include "mojo/public/c/system/message_pipe.h"
-#include "mojo/public/c/system/result.h"
-#include "mojo/public/c/system/time.h"
-#include "mojo/public/c/system/wait.h"
-
-#endif // MOJO_PUBLIC_C_SYSTEM_CORE_H_
diff --git a/mojo/public/c/system/functions.h b/mojo/public/c/system/functions.h
deleted file mode 100644
index 2c62392..0000000
--- a/mojo/public/c/system/functions.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// DEPRECATED -- do not use: include individual header files instead.
-//
-// TODO(vtl): Delete this header file.
-//
-// Note: This header should be compilable as C.
-
-#ifndef MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_
-#define MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_
-
-#include "mojo/public/c/system/handle.h"
-#include "mojo/public/c/system/time.h"
-#include "mojo/public/c/system/wait.h"
-
-#endif // MOJO_PUBLIC_C_SYSTEM_FUNCTIONS_H_
diff --git a/mojo/public/c/system/types.h b/mojo/public/c/system/types.h
deleted file mode 100644
index ad382eb..0000000
--- a/mojo/public/c/system/types.h
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// DEPRECATED -- do not use: include individual header files instead.
-//
-// TODO(vtl): Delete this header file.
-//
-// Note: This header should be compilable as C.
-
-#ifndef MOJO_PUBLIC_C_SYSTEM_TYPES_H_
-#define MOJO_PUBLIC_C_SYSTEM_TYPES_H_
-
-#include "mojo/public/c/system/handle.h"
-#include "mojo/public/c/system/result.h"
-#include "mojo/public/c/system/time.h"
-
-#endif // MOJO_PUBLIC_C_SYSTEM_TYPES_H_
diff --git a/mojo/public/c/system/wait.h b/mojo/public/c/system/wait.h
index a846882..36d31e2 100644
--- a/mojo/public/c/system/wait.h
+++ b/mojo/public/c/system/wait.h
@@ -102,9 +102,9 @@
const MojoHandleSignals* MOJO_RESTRICT signals, // In.
uint32_t num_handles, // In.
MojoDeadline deadline, // In.
- uint32_t* MOJO_RESTRICT result_index, // Optional out
+ uint32_t* MOJO_RESTRICT result_index, // Optional out.
struct MojoHandleSignalsState* MOJO_RESTRICT
- signals_states); // Optional out
+ signals_states); // Optional out.
MOJO_END_EXTERN_C
diff --git a/mojo/public/cpp/system/BUILD.gn b/mojo/public/cpp/system/BUILD.gn
index 09c3041..618fc9d 100644
--- a/mojo/public/cpp/system/BUILD.gn
+++ b/mojo/public/cpp/system/BUILD.gn
@@ -7,7 +7,6 @@
mojo_sdk_source_set("system") {
sources = [
"buffer.h",
- "core.h",
"data_pipe.h",
"handle.h",
"macros.h",
diff --git a/mojo/public/cpp/system/core.h b/mojo/public/cpp/system/core.h
deleted file mode 100644
index e50fa7d..0000000
--- a/mojo/public/cpp/system/core.h
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-// DEPRECATED -- do not use: include individual header files instead.
-//
-// TODO(vtl): Delete this header file.
-
-#ifndef MOJO_PUBLIC_CPP_SYSTEM_CORE_H_
-#define MOJO_PUBLIC_CPP_SYSTEM_CORE_H_
-
-#include "mojo/public/cpp/system/buffer.h"
-#include "mojo/public/cpp/system/data_pipe.h"
-#include "mojo/public/cpp/system/handle.h"
-#include "mojo/public/cpp/system/macros.h"
-#include "mojo/public/cpp/system/message_pipe.h"
-#include "mojo/public/cpp/system/time.h"
-
-#endif // MOJO_PUBLIC_CPP_SYSTEM_CORE_H_
