Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/command_buffer/service/mailbox_manager_unittest.cc

 // Copyright 2013 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.
 
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/mailbox_manager_impl.h"
 #include "gpu/command_buffer/service/mailbox_manager_sync.h"
 #include "gpu/command_buffer/service/texture_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 577 matching lines @@
   // Cleared state should be synced.
   EXPECT_FALSE(new_texture->SafeToRenderFrom());
 
   DestroyTexture(texture);
   DestroyTexture(new_texture);
 
   EXPECT_EQ(NULL, manager_->ConsumeTexture(name));
   EXPECT_EQ(NULL, manager2_->ConsumeTexture(name));
 }
 
-TEST_F(MailboxManagerSyncTest, SyncIncompleteTexture) {
-  const GLuint kNewTextureId = 1234;
-
-  // Create but not define texture.
-  Texture* texture = CreateTexture();
-  SetTarget(texture, GL_TEXTURE_2D, 1);
-  EXPECT_FALSE(texture->IsDefined());
-
-  Mailbox name = Mailbox::Generate();
-  manager_->ProduceTexture(name, texture);
-  EXPECT_EQ(texture, manager_->ConsumeTexture(name));
-
-  // Synchronize
-  manager_->PushTextureUpdates(0);
-  manager2_->PullTextureUpdates(0);
-
-  // Should sync to new texture which is not defined.
-  EXPECT_CALL(*gl_, GenTextures(1, _))
-      .WillOnce(SetArgPointee<1>(kNewTextureId));
-  SetupUpdateTexParamExpectations(kNewTextureId, texture->min_filter(),
-                                  texture->mag_filter(), texture->wrap_s(),
-                                  texture->wrap_t());
-  Texture* new_texture = manager2_->ConsumeTexture(name);
-  ASSERT_TRUE(new_texture);
-  EXPECT_NE(texture, new_texture);
-  EXPECT_EQ(kNewTextureId, new_texture->service_id());
-  EXPECT_FALSE(new_texture->IsDefined());
-
-  // Change cleared to false.
-  SetLevelInfo(texture,
-               GL_TEXTURE_2D,
-               0,
-               GL_RGBA,
-               1,
-               1,
-               1,
-               0,
-               GL_RGBA,
-               GL_UNSIGNED_BYTE,
-               true);
-  SetParameter(texture, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-  SetParameter(texture, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-  EXPECT_TRUE(texture->IsDefined());
-
-  // Synchronize
-  manager_->PushTextureUpdates(0);
-  SetupUpdateTexParamExpectations(
-      kNewTextureId, GL_LINEAR, GL_LINEAR, GL_REPEAT, GL_REPEAT);
-  manager2_->PullTextureUpdates(0);
-
-  // Cleared state should be synced.
-  EXPECT_TRUE(new_texture->IsDefined());
-
-  DestroyTexture(texture);
-  DestroyTexture(new_texture);
-
-  EXPECT_EQ(NULL, manager_->ConsumeTexture(name));
-  EXPECT_EQ(NULL, manager2_->ConsumeTexture(name));
-}
-
 // Putting the same texture into multiple mailboxes should result in sharing
 // only a single texture also within a synchronized manager instance.
 TEST_F(MailboxManagerSyncTest, SharedThroughMultipleMailboxes) {
   const GLuint kNewTextureId = 1234;
   InSequence sequence;
 
   Texture* texture = DefineTexture();
   Mailbox name1 = Mailbox::Generate();
   Mailbox name2 = Mailbox::Generate();
 
@@ skipping 56 matching lines @@
   manager2_->PullTextureUpdates(0);
 
   // name should return the original texture, and not texture2 or a new one.
   EXPECT_EQ(new_texture, manager2_->ConsumeTexture(name));
 
   DestroyTexture(texture1);
   DestroyTexture(texture2);
   DestroyTexture(new_texture);
 }
 
+// TODO: Produce incomplete texture
+
 // TODO: Texture::level_infos_[][].size()
 
 // TODO: unsupported targets and formats
 
 }  // namespace gles2
 }  // namespace gpu