Make Dispatcher::Type an enum class.

mojo/edk/system/data_pipe_impl_unittest.cc

 // Copyright 2015 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.
 
 // This file contains tests that are shared between different implementations of
 // |DataPipeImpl|.
 
 #include "mojo/edk/system/data_pipe_impl.h"
 
 #include <stdint.h>
@@ skipping 358 matching lines @@
     scoped_refptr<DataPipeProducerDispatcher> to_send =
         new DataPipeProducerDispatcher();
     to_send->Init(dp());
     scoped_refptr<Dispatcher> to_receive;
     SendDispatcher(0, to_send, &to_receive);
     // |to_send| should have been closed. This is |DCHECK()|ed when it is
     // destroyed.
     EXPECT_TRUE(to_send->HasOneRef());
     to_send = nullptr;
 
-    ASSERT_EQ(Dispatcher::kTypeDataPipeProducer, to_receive->GetType());
+    ASSERT_EQ(Dispatcher::Type::DATA_PIPE_PRODUCER, to_receive->GetType());
     producer_dispatcher_ =
         static_cast<DataPipeProducerDispatcher*>(to_receive.get());
   }
 
   DataPipe* DataPipeForProducer() override {
     if (producer_dispatcher_)
       return producer_dispatcher_->GetDataPipeForTest();
     return dp().get();
   }
   DataPipe* DataPipeForConsumer() override { return dp().get(); }
@@ skipping 29 matching lines @@
     scoped_refptr<DataPipeConsumerDispatcher> to_send =
         new DataPipeConsumerDispatcher();
     to_send->Init(dp());
     scoped_refptr<Dispatcher> to_receive;
     SendDispatcher(0, to_send, &to_receive);
     // |to_send| should have been closed. This is |DCHECK()|ed when it is
     // destroyed.
     EXPECT_TRUE(to_send->HasOneRef());
     to_send = nullptr;
 
-    ASSERT_EQ(Dispatcher::kTypeDataPipeConsumer, to_receive->GetType());
+    ASSERT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, to_receive->GetType());
     consumer_dispatcher_ =
         static_cast<DataPipeConsumerDispatcher*>(to_receive.get());
   }
 
   DataPipe* DataPipeForProducer() override { return dp().get(); }
   DataPipe* DataPipeForConsumer() override {
     if (consumer_dispatcher_)
       return consumer_dispatcher_->GetDataPipeForTest();
     return dp().get();
   }
@@ skipping 33 matching lines @@
     // This is the producer dispatcher we'll send.
     scoped_refptr<DataPipeProducerDispatcher> to_send =
         new DataPipeProducerDispatcher();
     to_send->Init(dp());
     scoped_refptr<Dispatcher> to_receive;
     SendDispatcher(0, to_send, &to_receive);
     // |to_send| should have been closed. This is |DCHECK()|ed when it is
     // destroyed.
     EXPECT_TRUE(to_send->HasOneRef());
     to_send = nullptr;
-    ASSERT_EQ(Dispatcher::kTypeDataPipeProducer, to_receive->GetType());
+    ASSERT_EQ(Dispatcher::Type::DATA_PIPE_PRODUCER, to_receive->GetType());
     to_send = static_cast<DataPipeProducerDispatcher*>(to_receive.get());
     to_receive = nullptr;
 
     // Now send it back the other way.
     SendDispatcher(1, to_send, &to_receive);
     // |producer_dispatcher_| should have been closed. This is |DCHECK()|ed when
     // it is destroyed.
     EXPECT_TRUE(to_send->HasOneRef());
     to_send = nullptr;
 
-    ASSERT_EQ(Dispatcher::kTypeDataPipeProducer, to_receive->GetType());
+    ASSERT_EQ(Dispatcher::Type::DATA_PIPE_PRODUCER, to_receive->GetType());
     producer_dispatcher_ =
         static_cast<DataPipeProducerDispatcher*>(to_receive.get());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RemoteProducerDataPipeImplTestHelper2);
 };
 
 // RemoteConsumerDataPipeImplTestHelper2 ---------------------------------------
 
@@ skipping 15 matching lines @@
     // This is the consumer dispatcher we'll send.
     scoped_refptr<DataPipeConsumerDispatcher> to_send =
         new DataPipeConsumerDispatcher();
     to_send->Init(dp());
     scoped_refptr<Dispatcher> to_receive;
     SendDispatcher(0, to_send, &to_receive);
     // |to_send| should have been closed. This is |DCHECK()|ed when it is
     // destroyed.
     EXPECT_TRUE(to_send->HasOneRef());
     to_send = nullptr;
-    ASSERT_EQ(Dispatcher::kTypeDataPipeConsumer, to_receive->GetType());
+    ASSERT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, to_receive->GetType());
     to_send = static_cast<DataPipeConsumerDispatcher*>(to_receive.get());
     to_receive = nullptr;
 
     // Now send it back the other way.
     SendDispatcher(1, to_send, &to_receive);
     // |consumer_dispatcher_| should have been closed. This is |DCHECK()|ed when
     // it is destroyed.
     EXPECT_TRUE(to_send->HasOneRef());
     to_send = nullptr;
 
-    ASSERT_EQ(Dispatcher::kTypeDataPipeConsumer, to_receive->GetType());
+    ASSERT_EQ(Dispatcher::Type::DATA_PIPE_CONSUMER, to_receive->GetType());
     consumer_dispatcher_ =
         static_cast<DataPipeConsumerDispatcher*>(to_receive.get());
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RemoteConsumerDataPipeImplTestHelper2);
 };
 
 // Test case instantiation -----------------------------------------------------
 
@@ skipping 1838 matching lines @@
             this->ConsumerQueryData(MakeUserPointer(&num_bytes)));
   EXPECT_EQ(1u * sizeof(int32_t), num_bytes);
 
   this->ProducerClose();
   this->ConsumerClose();
 }
 
 }  // namespace
 }  // namespace system
 }  // namespace mojo