Revert of Fix (or tag) uses of explicit '64' instead of GL_MAILBOX_SIZE_CHROMIUM

cc/resources/resource_provider_unittest.cc

 // Copyright 2012 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 "cc/resources/resource_provider.h"
 
 #include <algorithm>
 #include <map>
 
 #include "base/bind.h"
@@ skipping 87 matching lines @@
 // contents as well as information about sync points.
 class ContextSharedData {
  public:
   static scoped_ptr<ContextSharedData> Create() {
     return make_scoped_ptr(new ContextSharedData());
   }
 
   uint32 InsertSyncPoint() { return next_sync_point_++; }
 
   void GenMailbox(GLbyte* mailbox) {
-    memset(mailbox, 0, GL_MAILBOX_SIZE_CHROMIUM);
+    memset(mailbox, 0, sizeof(GLbyte[64]));
     memcpy(mailbox, &next_mailbox_, sizeof(next_mailbox_));
     ++next_mailbox_;
   }
 
   void ProduceTexture(const GLbyte* mailbox_name,
                       uint32 sync_point,
                       scoped_refptr<TestTexture> texture) {
     unsigned mailbox = 0;
     memcpy(&mailbox, mailbox_name, sizeof(mailbox));
     ASSERT_TRUE(mailbox && mailbox < next_mailbox_);
@@ skipping 196 matching lines @@
                     TextureSizeBytes(gfx::Size(xoffset, 1), texture->format);
     const uint8_t* src = static_cast<const uint8_t*>(pixels);
     for (int i = 0; i < height; ++i) {
       memcpy(dest, src, in_pitch);
       dest += out_pitch;
       src += in_pitch;
     }
   }
 
   struct PendingProduceTexture {
-    GLbyte mailbox[GL_MAILBOX_SIZE_CHROMIUM];
+    GLbyte mailbox[64];
     scoped_refptr<TestTexture> texture;
   };
   typedef ScopedPtrDeque<PendingProduceTexture> PendingProduceTextureList;
   ContextSharedData* shared_data_;
   GLuint last_waited_sync_point_;
   PendingProduceTextureList pending_produce_textures_;
 };
 
 void FreeSharedBitmap(SharedBitmap* shared_bitmap) {
   delete shared_bitmap->memory();
 }
 
 void IgnoreSharedBitmap(SharedBitmap* shared_bitmap) {}
 
 class TestSharedBitmapManager : public SharedBitmapManager {
  public:
   TestSharedBitmapManager() : count_(0) {}
   virtual ~TestSharedBitmapManager() {}
 
   virtual scoped_ptr<SharedBitmap> AllocateSharedBitmap(const gfx::Size& size)
       OVERRIDE {
     scoped_ptr<base::SharedMemory> memory(new base::SharedMemory);
     memory->CreateAndMapAnonymous(size.GetArea() * 4);
-    int8 name[GL_MAILBOX_SIZE_CHROMIUM] = {0};
+    int8 name[64] = { 0 };
     name[0] = count_++;
     SharedBitmapId id;
     id.SetName(name);
     bitmap_map_[id] = memory.get();
     return scoped_ptr<SharedBitmap>(
         new SharedBitmap(memory.release(), id, base::Bind(&FreeSharedBitmap)));
   }
 
   virtual scoped_ptr<SharedBitmap> GetSharedBitmapFromId(
       const gfx::Size&,
       const SharedBitmapId& id) OVERRIDE {
     if (bitmap_map_.find(id) == bitmap_map_.end())
       return scoped_ptr<SharedBitmap>();
     return scoped_ptr<SharedBitmap>(
         new SharedBitmap(bitmap_map_[id], id, base::Bind(&IgnoreSharedBitmap)));
   }
 
   virtual scoped_ptr<SharedBitmap> GetBitmapForSharedMemory(
       base::SharedMemory* memory) OVERRIDE {
-    int8 name[GL_MAILBOX_SIZE_CHROMIUM] = {0};
+    int8 name[64] = { 0 };
     name[0] = count_++;
     SharedBitmapId id;
     id.SetName(name);
     bitmap_map_[id] = memory;
     return scoped_ptr<SharedBitmap>(
         new SharedBitmap(memory, id, base::Bind(&IgnoreSharedBitmap)));
   }
 
  private:
   int count_;
@@ skipping 2809 matching lines @@
     resource_provider->AllocateForTesting(id);
     Mock::VerifyAndClearExpectations(context);
 
     DCHECK_EQ(10u, context->PeekTextureId());
     resource_provider->DeleteResource(id);
   }
 }
 
 }  // namespace
 }  // namespace cc