In ppapi/tests: |... const*| -> |const ...*| (for consistency).

Also fix a bunch of |reinterpret_cast|s (to |static_cast|).

So we can stop cutting-and-pasting the same mistakes over and over.


Review URL: http://codereview.chromium.org/8879009

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

18 files changed, 28 insertions, 34 deletions

diff --git a/ppapi/tests/test_audio.cc b/ppapi/tests/test_audio.cc
index 539ae85..91c4d6d 100644
--- a/ppapi/tests/test_audio.cc
+++ b/ppapi/tests/test_audio.cc
@@ -18,9 +18,9 @@
 REGISTER_TEST_CASE(Audio);
 
 bool TestAudio::Init() {
-  audio_interface_ = static_cast<PPB_Audio const*>(
+  audio_interface_ = static_cast<const PPB_Audio*>(
       pp::Module::Get()->GetBrowserInterface(PPB_AUDIO_INTERFACE));
-  audio_config_interface_ = static_cast<PPB_AudioConfig const*>(
+  audio_config_interface_ = static_cast<const PPB_AudioConfig*>(
       pp::Module::Get()->GetBrowserInterface(PPB_AUDIO_CONFIG_INTERFACE));
   core_interface_ = static_cast<const PPB_Core*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CORE_INTERFACE));
diff --git a/ppapi/tests/test_audio_config.cc b/ppapi/tests/test_audio_config.cc
index 003d3e0..79e847ff 100644
--- a/ppapi/tests/test_audio_config.cc
+++ b/ppapi/tests/test_audio_config.cc
@@ -11,7 +11,7 @@
 REGISTER_TEST_CASE(AudioConfig);
 
 bool TestAudioConfig::Init() {
-  audio_config_interface_ = static_cast<PPB_AudioConfig const*>(
+  audio_config_interface_ = static_cast<const PPB_AudioConfig*>(
       pp::Module::Get()->GetBrowserInterface(PPB_AUDIO_CONFIG_INTERFACE));
   core_interface_ = static_cast<const PPB_Core*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CORE_INTERFACE));
diff --git a/ppapi/tests/test_broker.cc b/ppapi/tests/test_broker.cc
index 22e3e62..9376029 100644
--- a/ppapi/tests/test_broker.cc
+++ b/ppapi/tests/test_broker.cc
@@ -202,7 +202,7 @@ TestBroker::TestBroker(TestingInstance* instance)
 }
 
 bool TestBroker::Init() {
-  broker_interface_ = static_cast<PPB_BrokerTrusted const*>(
+  broker_interface_ = static_cast<const PPB_BrokerTrusted*>(
       pp::Module::Get()->GetBrowserInterface(PPB_BROKER_TRUSTED_INTERFACE));
   return !!broker_interface_;
 }
diff --git a/ppapi/tests/test_buffer.cc b/ppapi/tests/test_buffer.cc
index 902bd2f..e6d7063 100644
--- a/ppapi/tests/test_buffer.cc
+++ b/ppapi/tests/test_buffer.cc
@@ -14,7 +14,7 @@
 REGISTER_TEST_CASE(Buffer);
 
 bool TestBuffer::Init() {
-  buffer_interface_ = reinterpret_cast<PPB_Buffer_Dev const*>(
+  buffer_interface_ = static_cast<const PPB_Buffer_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_BUFFER_DEV_INTERFACE));
   return !!buffer_interface_;
 }
diff --git a/ppapi/tests/test_char_set.cc b/ppapi/tests/test_char_set.cc
index 868c350..b1bbe54 100644
--- a/ppapi/tests/test_char_set.cc
+++ b/ppapi/tests/test_char_set.cc
@@ -17,7 +17,7 @@ TestCharSet::TestCharSet(TestingInstance* instance)
 }
 
 bool TestCharSet::Init() {
-  char_set_interface_ = static_cast<PPB_CharSet_Dev const*>(
+  char_set_interface_ = static_cast<const PPB_CharSet_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CHAR_SET_DEV_INTERFACE));
   return !!char_set_interface_;
 }
diff --git a/ppapi/tests/test_crypto.cc b/ppapi/tests/test_crypto.cc
index 8371e61..cfeb5a8 100644
--- a/ppapi/tests/test_crypto.cc
+++ b/ppapi/tests/test_crypto.cc
@@ -16,7 +16,7 @@ TestCrypto::TestCrypto(TestingInstance* instance)
 }
 
 bool TestCrypto::Init() {
-  crypto_interface_ = static_cast<PPB_Crypto_Dev const*>(
+  crypto_interface_ = static_cast<const PPB_Crypto_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CRYPTO_DEV_INTERFACE));
   return !!crypto_interface_;
 }
diff --git a/ppapi/tests/test_cursor_control.cc b/ppapi/tests/test_cursor_control.cc
index 55e5225..248663e 100644
--- a/ppapi/tests/test_cursor_control.cc
+++ b/ppapi/tests/test_cursor_control.cc
@@ -16,7 +16,7 @@ TestCursorControl::TestCursorControl(TestingInstance* instance)
 }
 
 bool TestCursorControl::Init() {
-  cursor_control_interface_ = static_cast<PPB_CursorControl_Dev const*>(
+  cursor_control_interface_ = static_cast<const PPB_CursorControl_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_CURSOR_CONTROL_DEV_INTERFACE));
   return !!cursor_control_interface_;
 }
diff --git a/ppapi/tests/test_graphics_2d.cc b/ppapi/tests/test_graphics_2d.cc
index 4965898..63cfc42 100644
--- a/ppapi/tests/test_graphics_2d.cc
+++ b/ppapi/tests/test_graphics_2d.cc
@@ -27,15 +27,15 @@ void FlushCallbackNOP(void* data, int32_t result) {
 }
 
 void FlushCallbackQuitMessageLoop(void* data, int32_t result) {
-  reinterpret_cast<TestGraphics2D*>(data)->QuitMessageLoop();
+  static_cast<TestGraphics2D*>(data)->QuitMessageLoop();
 }
 
 }  // namespace
 
 bool TestGraphics2D::Init() {
-  graphics_2d_interface_ = reinterpret_cast<PPB_Graphics2D const*>(
+  graphics_2d_interface_ = static_cast<const PPB_Graphics2D*>(
       pp::Module::Get()->GetBrowserInterface(PPB_GRAPHICS_2D_INTERFACE));
-  image_data_interface_ = reinterpret_cast<PPB_ImageData const*>(
+  image_data_interface_ = static_cast<const PPB_ImageData*>(
       pp::Module::Get()->GetBrowserInterface(PPB_IMAGEDATA_INTERFACE));
   return graphics_2d_interface_ && image_data_interface_ &&
          InitTestingInterface();
diff --git a/ppapi/tests/test_graphics_3d.cc b/ppapi/tests/test_graphics_3d.cc
index 4bdd09d..75b4d68 100644
--- a/ppapi/tests/test_graphics_3d.cc
+++ b/ppapi/tests/test_graphics_3d.cc
@@ -16,7 +16,7 @@
 REGISTER_TEST_CASE(Graphics3D);
 
 bool TestGraphics3D::Init() {
-  opengl_es2_ = reinterpret_cast<const PPB_OpenGLES2*>(
+  opengl_es2_ = static_cast<const PPB_OpenGLES2*>(
       pp::Module::Get()->GetBrowserInterface(PPB_OPENGLES2_INTERFACE));
   return opengl_es2_ && InitTestingInterface();
 }
diff --git a/ppapi/tests/test_image_data.cc b/ppapi/tests/test_image_data.cc
index cd56a52..f101147 100644
--- a/ppapi/tests/test_image_data.cc
+++ b/ppapi/tests/test_image_data.cc
@@ -13,7 +13,7 @@
 REGISTER_TEST_CASE(ImageData);
 
 bool TestImageData::Init() {
-  image_data_interface_ = reinterpret_cast<PPB_ImageData const*>(
+  image_data_interface_ = static_cast<const PPB_ImageData*>(
       pp::Module::Get()->GetBrowserInterface(PPB_IMAGEDATA_INTERFACE));
   return !!image_data_interface_;
 }
diff --git a/ppapi/tests/test_input_event.cc b/ppapi/tests/test_input_event.cc
index 378a677..49526db 100644
--- a/ppapi/tests/test_input_event.cc
+++ b/ppapi/tests/test_input_event.cc
@@ -57,15 +57,15 @@ TestInputEvent::~TestInputEvent() {
 }
 
 bool TestInputEvent::Init() {
-  input_event_interface_ = static_cast<PPB_InputEvent const*>(
+  input_event_interface_ = static_cast<const PPB_InputEvent*>(
       pp::Module::Get()->GetBrowserInterface(PPB_INPUT_EVENT_INTERFACE));
-  mouse_input_event_interface_ = static_cast<PPB_MouseInputEvent const*>(
+  mouse_input_event_interface_ = static_cast<const PPB_MouseInputEvent*>(
       pp::Module::Get()->GetBrowserInterface(
           PPB_MOUSE_INPUT_EVENT_INTERFACE));
-  wheel_input_event_interface_ = static_cast<PPB_WheelInputEvent const*>(
+  wheel_input_event_interface_ = static_cast<const PPB_WheelInputEvent*>(
       pp::Module::Get()->GetBrowserInterface(
           PPB_WHEEL_INPUT_EVENT_INTERFACE));
-  keyboard_input_event_interface_ = static_cast<PPB_KeyboardInputEvent const*>(
+  keyboard_input_event_interface_ = static_cast<const PPB_KeyboardInputEvent*>(
       pp::Module::Get()->GetBrowserInterface(
           PPB_KEYBOARD_INPUT_EVENT_INTERFACE));
 
diff --git a/ppapi/tests/test_tcp_socket_private_shared.cc b/ppapi/tests/test_tcp_socket_private_shared.cc
index 7ca3666..a052118 100644
--- a/ppapi/tests/test_tcp_socket_private_shared.cc
+++ b/ppapi/tests/test_tcp_socket_private_shared.cc
@@ -25,10 +25,8 @@ TestTCPSocketPrivateShared::TestTCPSocketPrivateShared(
 }
 
 bool TestTCPSocketPrivateShared::Init() {
-  tcp_socket_private_interface_ =
-      reinterpret_cast<PPB_TCPSocket_Private const*>(
-          pp::Module::Get()->GetBrowserInterface(
-              PPB_TCPSOCKET_PRIVATE_INTERFACE));
+  tcp_socket_private_interface_ = static_cast<const PPB_TCPSocket_Private*>(
+      pp::Module::Get()->GetBrowserInterface(PPB_TCPSOCKET_PRIVATE_INTERFACE));
   if (!tcp_socket_private_interface_)
     instance_->AppendError("TCPSocketPrivate interface not available");
   return tcp_socket_private_interface_ && InitTestingInterface();
diff --git a/ppapi/tests/test_transport.cc b/ppapi/tests/test_transport.cc
index 71f49b8..c5ea69c 100644
--- a/ppapi/tests/test_transport.cc
+++ b/ppapi/tests/test_transport.cc
@@ -103,7 +103,7 @@ TestTransport::~TestTransport() {
 }
 
 bool TestTransport::Init() {
-  transport_interface_ = reinterpret_cast<PPB_Transport_Dev const*>(
+  transport_interface_ = static_cast<const PPB_Transport_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_TRANSPORT_DEV_INTERFACE));
   return transport_interface_ && InitTestingInterface();
 }
diff --git a/ppapi/tests/test_udp_socket_private_shared.cc b/ppapi/tests/test_udp_socket_private_shared.cc
index 73c7523..192f00f 100644
--- a/ppapi/tests/test_udp_socket_private_shared.cc
+++ b/ppapi/tests/test_udp_socket_private_shared.cc
@@ -23,17 +23,13 @@ TestUDPSocketPrivateShared::TestUDPSocketPrivateShared(
 }
 
 bool TestUDPSocketPrivateShared::Init() {
-  tcp_socket_private_interface_ =
-      reinterpret_cast<PPB_TCPSocket_Private const*>(
-          pp::Module::Get()->GetBrowserInterface(
-              PPB_TCPSOCKET_PRIVATE_INTERFACE));
+  tcp_socket_private_interface_ = static_cast<const PPB_TCPSocket_Private*>(
+      pp::Module::Get()->GetBrowserInterface(PPB_TCPSOCKET_PRIVATE_INTERFACE));
   if (!tcp_socket_private_interface_)
     instance_->AppendError("TCPSocketPrivate interface not available");
 
-  udp_socket_private_interface_ =
-      reinterpret_cast<PPB_UDPSocket_Private const*>(
-          pp::Module::Get()->GetBrowserInterface(
-              PPB_UDPSOCKET_PRIVATE_INTERFACE));
+  udp_socket_private_interface_ = static_cast<const PPB_UDPSocket_Private*>(
+      pp::Module::Get()->GetBrowserInterface(PPB_UDPSOCKET_PRIVATE_INTERFACE));
   if (!udp_socket_private_interface_)
     instance_->AppendError("UDPSocketPrivate interface not available");
 
diff --git a/ppapi/tests/test_uma.cc b/ppapi/tests/test_uma.cc
index b16c891..46efcbe 100644
--- a/ppapi/tests/test_uma.cc
+++ b/ppapi/tests/test_uma.cc
@@ -12,7 +12,7 @@
 REGISTER_TEST_CASE(UMA);
 
 bool TestUMA::Init() {
-  uma_interface_ = reinterpret_cast<PPB_UMA_Private const*>(
+  uma_interface_ = static_cast<const PPB_UMA_Private*>(
       pp::Module::Get()->GetBrowserInterface(PPB_UMA_PRIVATE_INTERFACE));
   return !!uma_interface_;
 }
diff --git a/ppapi/tests/test_utils.cc b/ppapi/tests/test_utils.cc
index df13fde..d5df942 100644
--- a/ppapi/tests/test_utils.cc
+++ b/ppapi/tests/test_utils.cc
@@ -18,7 +18,7 @@ const int kActionTimeoutMs = 10000;
 
 const PPB_Testing_Dev* GetTestingInterface() {
   static const PPB_Testing_Dev* g_testing_interface =
-      reinterpret_cast<PPB_Testing_Dev const*>(
+      static_cast<const PPB_Testing_Dev*>(
           pp::Module::Get()->GetBrowserInterface(PPB_TESTING_DEV_INTERFACE));
   return g_testing_interface;
 }
diff --git a/ppapi/tests/test_var.cc b/ppapi/tests/test_var.cc
index 050fdb9..27c4882 100644
--- a/ppapi/tests/test_var.cc
+++ b/ppapi/tests/test_var.cc
@@ -25,7 +25,7 @@ uint32_t kInvalidLength = static_cast<uint32_t>(-1);
 REGISTER_TEST_CASE(Var);
 
 bool TestVar::Init() {
-  var_interface_ = reinterpret_cast<const PPB_Var*>(
+  var_interface_ = static_cast<const PPB_Var*>(
       pp::Module::Get()->GetBrowserInterface(PPB_VAR_INTERFACE));
   return var_interface_ && InitTestingInterface();
 }
diff --git a/ppapi/tests/test_video_decoder.cc b/ppapi/tests/test_video_decoder.cc
index faaa772..eed14d8 100644
--- a/ppapi/tests/test_video_decoder.cc
+++ b/ppapi/tests/test_video_decoder.cc
@@ -13,7 +13,7 @@
 REGISTER_TEST_CASE(VideoDecoder);
 
 bool TestVideoDecoder::Init() {
-  video_decoder_interface_ = reinterpret_cast<PPB_VideoDecoder_Dev const*>(
+  video_decoder_interface_ = static_cast<const PPB_VideoDecoder_Dev*>(
       pp::Module::Get()->GetBrowserInterface(PPB_VIDEODECODER_DEV_INTERFACE));
   return video_decoder_interface_ && InitTestingInterface();
 }