Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / cc / layers / delegated_frame_provider_unittest.cc

diff --git a/src/cc/layers/delegated_frame_provider_unittest.cc b/src/cc/layers/delegated_frame_provider_unittest.cc
index 8462595..5ba92bf 100644 (file)
--- a/src/cc/layers/delegated_frame_provider_unittest.cc
+++ b/src/cc/layers/delegated_frame_provider_unittest.cc
@@ -62,14 +62,14 @@ class DelegatedFrameProviderTest
                  false);
   }
 
-  virtual void SetUp() OVERRIDE {
+  virtual void SetUp() override {
     resource_collection_ = new DelegatedFrameResourceCollection;
     resource_collection_->SetClient(this);
   }
 
-  virtual void TearDown() OVERRIDE { resource_collection_->SetClient(NULL); }
+  virtual void TearDown() override { resource_collection_->SetClient(nullptr); }
 
-  virtual void UnusedResourcesAreAvailable() OVERRIDE {
+  void UnusedResourcesAreAvailable() override {
     resources_available_ = true;
     resource_collection_->TakeUnusedResourcesForChildCompositor(&resources_);
   }
@@ -106,7 +106,7 @@ TEST_F(DelegatedFrameProviderTest, SameResources) {
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
   EXPECT_EQ(0u, resources_.size());
 
-  frame_provider_ = NULL;
+  frame_provider_ = nullptr;
 
   EXPECT_TRUE(ReturnAndResetResourcesAvailable());
   EXPECT_EQ(1u, resources_.size());
@@ -132,7 +132,7 @@ TEST_F(DelegatedFrameProviderTest, ReplaceResources) {
   EXPECT_EQ(444u, resources_[0].id);
   resources_.clear();
 
-  frame_provider_ = NULL;
+  frame_provider_ = nullptr;
 
   EXPECT_TRUE(ReturnAndResetResourcesAvailable());
   EXPECT_EQ(1u, resources_.size());
@@ -272,11 +272,11 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProviderUntilDestroy) {
 
   // Releasing all references to the frame provider will release
   // the frame.
-  observer1 = NULL;
-  observer2 = NULL;
+  observer1 = nullptr;
+  observer2 = nullptr;
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());
 
-  frame_provider_ = NULL;
+  frame_provider_ = nullptr;
 
   EXPECT_TRUE(ReturnAndResetResourcesAvailable());
   EXPECT_EQ(1u, resources_.size());
@@ -386,7 +386,7 @@ TEST_F(DelegatedFrameProviderTest, NothingReturnedAfterLoss) {
   EXPECT_TRUE(ReturnAndResetResourcesAvailable());
   resources_.clear();
 
-  frame_provider_ = NULL;
+  frame_provider_ = nullptr;
 
   // Nothing is returned twice.
   EXPECT_FALSE(ReturnAndResetResourcesAvailable());