summaryrefslogtreecommitdiffstats
path: root/components/nacl/renderer
diff options
context:
space:
mode:
authormseaborn <mseaborn@chromium.org>2016-01-15 13:24:00 -0800
committerCommit bot <commit-bot@chromium.org>2016-01-15 21:25:27 +0000
commit2c2aee805d4f2f7d5532bfd4fd1ebdcea230aa42 (patch)
tree79ad36567d1969f0721cf03005709f624a30675c /components/nacl/renderer
parentcbdf52e495490cb8e84ac5c55d89be34fdfb2c62 (diff)
downloadchromium_src-2c2aee805d4f2f7d5532bfd4fd1ebdcea230aa42.zip
chromium_src-2c2aee805d4f2f7d5532bfd4fd1ebdcea230aa42.tar.gz
chromium_src-2c2aee805d4f2f7d5532bfd4fd1ebdcea230aa42.tar.bz2
NaCl cleanup: Remove/convert #includes of nacl_macros.h
Convert to using DISALLOW_COPY_AND_ASSIGN from base/macros.h instead of NACL_DISALLOW_COPY_AND_ASSIGN. BUG=302078 TEST=build Review URL: https://codereview.chromium.org/1581933003 Cr-Commit-Position: refs/heads/master@{#369843}
Diffstat (limited to 'components/nacl/renderer')
-rw-r--r--components/nacl/renderer/plugin/nacl_subprocess.h5
-rw-r--r--components/nacl/renderer/plugin/plugin.cc1
-rw-r--r--components/nacl/renderer/plugin/plugin.h4
-rw-r--r--components/nacl/renderer/plugin/plugin_error.h3
-rw-r--r--components/nacl/renderer/plugin/pnacl_coordinator.h5
-rw-r--r--components/nacl/renderer/plugin/pnacl_resources.h5
-rw-r--r--components/nacl/renderer/plugin/pnacl_translate_thread.h3
-rw-r--r--components/nacl/renderer/plugin/service_runtime.cc1
-rw-r--r--components/nacl/renderer/plugin/service_runtime.h5
-rw-r--r--components/nacl/renderer/plugin/temporary_file.h5
-rw-r--r--components/nacl/renderer/plugin/utility.h1
11 files changed, 14 insertions, 24 deletions
diff --git a/components/nacl/renderer/plugin/nacl_subprocess.h b/components/nacl/renderer/plugin/nacl_subprocess.h
index 9b2c684..df0c530 100644
--- a/components/nacl/renderer/plugin/nacl_subprocess.h
+++ b/components/nacl/renderer/plugin/nacl_subprocess.h
@@ -16,7 +16,6 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "components/nacl/renderer/plugin/service_runtime.h"
-#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/portability.h"
namespace plugin {
@@ -48,12 +47,12 @@ class NaClSubprocess {
void Shutdown();
private:
- NACL_DISALLOW_COPY_AND_ASSIGN(NaClSubprocess);
-
std::string description_;
// The service runtime representing the NaCl module instance.
scoped_ptr<ServiceRuntime> service_runtime_;
+
+ DISALLOW_COPY_AND_ASSIGN(NaClSubprocess);
};
} // namespace plugin
diff --git a/components/nacl/renderer/plugin/plugin.cc b/components/nacl/renderer/plugin/plugin.cc
index dde2a2e..a2c2f39 100644
--- a/components/nacl/renderer/plugin/plugin.cc
+++ b/components/nacl/renderer/plugin/plugin.cc
@@ -16,7 +16,6 @@
#include "components/nacl/renderer/plugin/utility.h"
#include "components/nacl/renderer/ppb_nacl_private.h"
#include "native_client/src/include/nacl_base.h"
-#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/portability.h"
#include "native_client/src/include/portability_io.h"
#include "ppapi/c/pp_errors.h"
diff --git a/components/nacl/renderer/plugin/plugin.h b/components/nacl/renderer/plugin/plugin.h
index 46c5cfe..83574bb 100644
--- a/components/nacl/renderer/plugin/plugin.h
+++ b/components/nacl/renderer/plugin/plugin.h
@@ -21,7 +21,6 @@
#include "components/nacl/renderer/plugin/service_runtime.h"
#include "components/nacl/renderer/plugin/utility.h"
#include "components/nacl/renderer/ppb_nacl_private.h"
-#include "native_client/src/include/nacl_macros.h"
#include "ppapi/cpp/instance.h"
#include "ppapi/cpp/private/uma_private.h"
#include "ppapi/cpp/url_loader.h"
@@ -97,7 +96,6 @@ class Plugin : public pp::Instance {
const PPB_NaCl_Private* nacl_interface() const { return nacl_interface_; }
private:
- NACL_DISALLOW_COPY_AND_ASSIGN(Plugin);
// The browser will invoke the destructor via the pp::Instance
// pointer to this object, not from base's Delete().
~Plugin() override;
@@ -148,6 +146,8 @@ class Plugin : public pp::Instance {
const PPB_NaCl_Private* nacl_interface_;
pp::UMAPrivate uma_interface_;
+
+ DISALLOW_COPY_AND_ASSIGN(Plugin);
};
} // namespace plugin
diff --git a/components/nacl/renderer/plugin/plugin_error.h b/components/nacl/renderer/plugin/plugin_error.h
index e1789ce..42825be 100644
--- a/components/nacl/renderer/plugin/plugin_error.h
+++ b/components/nacl/renderer/plugin/plugin_error.h
@@ -15,7 +15,6 @@
#include "base/macros.h"
#include "components/nacl/renderer/ppb_nacl_private.h"
-#include "native_client/src/include/nacl_macros.h"
namespace plugin {
@@ -41,7 +40,7 @@ class ErrorInfo {
private:
PP_NaClError error_code_;
std::string message_;
- NACL_DISALLOW_COPY_AND_ASSIGN(ErrorInfo);
+ DISALLOW_COPY_AND_ASSIGN(ErrorInfo);
};
} // namespace plugin
diff --git a/components/nacl/renderer/plugin/pnacl_coordinator.h b/components/nacl/renderer/plugin/pnacl_coordinator.h
index 999559d..b409c24 100644
--- a/components/nacl/renderer/plugin/pnacl_coordinator.h
+++ b/components/nacl/renderer/plugin/pnacl_coordinator.h
@@ -15,7 +15,6 @@
#include "components/nacl/renderer/plugin/nacl_subprocess.h"
#include "components/nacl/renderer/plugin/plugin_error.h"
#include "components/nacl/renderer/plugin/pnacl_resources.h"
-#include "native_client/src/include/nacl_macros.h"
#include "ppapi/cpp/completion_callback.h"
#include "ppapi/utility/completion_callback_factory.h"
@@ -88,8 +87,6 @@ class PnaclCoordinator {
void BitcodeStreamDidFinish(int32_t pp_error);
private:
- NACL_DISALLOW_COPY_AND_ASSIGN(PnaclCoordinator);
-
// BitcodeToNative is the factory method for PnaclCoordinators.
// Therefore the constructor is private.
PnaclCoordinator(Plugin* plugin,
@@ -188,6 +185,8 @@ class PnaclCoordinator {
// It accesses fields of PnaclCoordinator so it must have a
// shorter lifetime.
scoped_ptr<PnaclTranslateThread> translate_thread_;
+
+ DISALLOW_COPY_AND_ASSIGN(PnaclCoordinator);
};
//----------------------------------------------------------------------
diff --git a/components/nacl/renderer/plugin/pnacl_resources.h b/components/nacl/renderer/plugin/pnacl_resources.h
index 25cb85f..85288df 100644
--- a/components/nacl/renderer/plugin/pnacl_resources.h
+++ b/components/nacl/renderer/plugin/pnacl_resources.h
@@ -7,7 +7,6 @@
#include "base/macros.h"
#include "components/nacl/renderer/ppb_nacl_private.h"
-#include "native_client/src/include/nacl_macros.h"
#include "ppapi/cpp/completion_callback.h"
namespace plugin {
@@ -47,13 +46,13 @@ class PnaclResources {
PP_NaClFileInfo TakeFileInfo(ResourceType type);
private:
- NACL_DISALLOW_COPY_AND_ASSIGN(PnaclResources);
-
// The plugin requesting the resource loading.
Plugin* plugin_;
bool use_subzero_;
PnaclResourceEntry resources_[NUM_TYPES + 1];
+
+ DISALLOW_COPY_AND_ASSIGN(PnaclResources);
};
} // namespace plugin
diff --git a/components/nacl/renderer/plugin/pnacl_translate_thread.h b/components/nacl/renderer/plugin/pnacl_translate_thread.h
index 21248e3..1092d02 100644
--- a/components/nacl/renderer/plugin/pnacl_translate_thread.h
+++ b/components/nacl/renderer/plugin/pnacl_translate_thread.h
@@ -13,7 +13,6 @@
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "components/nacl/renderer/plugin/plugin_error.h"
-#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/shared/platform/nacl_sync_checked.h"
#include "native_client/src/shared/platform/nacl_threads.h"
#include "ppapi/cpp/completion_callback.h"
@@ -159,7 +158,7 @@ class PnaclTranslateThread {
base::ProcessId ld_channel_peer_pid_;
private:
- NACL_DISALLOW_COPY_AND_ASSIGN(PnaclTranslateThread);
+ DISALLOW_COPY_AND_ASSIGN(PnaclTranslateThread);
};
}
diff --git a/components/nacl/renderer/plugin/service_runtime.cc b/components/nacl/renderer/plugin/service_runtime.cc
index c02e7dc..4e25fba 100644
--- a/components/nacl/renderer/plugin/service_runtime.cc
+++ b/components/nacl/renderer/plugin/service_runtime.cc
@@ -14,7 +14,6 @@
#include "base/logging.h"
#include "components/nacl/renderer/plugin/plugin.h"
#include "components/nacl/renderer/plugin/utility.h"
-#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/portability_io.h"
#include "native_client/src/include/portability_string.h"
#include "native_client/src/trusted/service_runtime/nacl_error_code.h"
diff --git a/components/nacl/renderer/plugin/service_runtime.h b/components/nacl/renderer/plugin/service_runtime.h
index d5571ff..a073725 100644
--- a/components/nacl/renderer/plugin/service_runtime.h
+++ b/components/nacl/renderer/plugin/service_runtime.h
@@ -16,7 +16,6 @@
#include "base/process/process_handle.h"
#include "components/nacl/renderer/plugin/utility.h"
#include "ipc/ipc_sync_channel.h"
-#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/shared/platform/nacl_sync.h"
#include "ppapi/cpp/completion_callback.h"
@@ -68,8 +67,6 @@ class ServiceRuntime {
base::ProcessId get_process_id() { return process_id_; }
private:
- NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime);
-
Plugin* plugin_;
PP_Instance pp_instance_;
bool main_service_runtime_;
@@ -77,6 +74,8 @@ class ServiceRuntime {
scoped_ptr<IPC::SyncChannel> translator_channel_;
base::ProcessId process_id_;
+
+ DISALLOW_COPY_AND_ASSIGN(ServiceRuntime);
};
} // namespace plugin
diff --git a/components/nacl/renderer/plugin/temporary_file.h b/components/nacl/renderer/plugin/temporary_file.h
index 07bbdac..fe496f4 100644
--- a/components/nacl/renderer/plugin/temporary_file.h
+++ b/components/nacl/renderer/plugin/temporary_file.h
@@ -10,7 +10,6 @@
#include "base/files/file.h"
#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
-#include "native_client/src/include/nacl_macros.h"
#include "ppapi/c/private/pp_file_handle.h"
@@ -59,10 +58,10 @@ class TempFile {
PP_FileHandle GetFileHandle();
private:
- NACL_DISALLOW_COPY_AND_ASSIGN(TempFile);
-
Plugin* plugin_;
base::File file_handle_;
+
+ DISALLOW_COPY_AND_ASSIGN(TempFile);
};
} // namespace plugin
diff --git a/components/nacl/renderer/plugin/utility.h b/components/nacl/renderer/plugin/utility.h
index 9c0c560..8dd1441 100644
--- a/components/nacl/renderer/plugin/utility.h
+++ b/components/nacl/renderer/plugin/utility.h
@@ -12,7 +12,6 @@
#include <stdint.h>
#include "components/nacl/renderer/ppb_nacl_private.h"
-#include "native_client/src/include/nacl_macros.h"
#include "native_client/src/include/portability.h"
#include "native_client/src/shared/platform/nacl_threads.h"
#include "native_client/src/shared/platform/nacl_time.h"
generated by cgit v1.1 at 2025-03-28 06:48:42 +0000