Revert 261380 "cc: Remove TextureLayer::SetTextureId and Texture..."

trunk/src/content/shell/renderer/test_runner/TestPlugin.cpp

 // 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 "content/shell/renderer/test_runner/TestPlugin.h"
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/shared_memory.h"
@@ skipping 204 matching lines @@
         m_container->requestTouchEventType(WebPluginContainer::TouchEventRequestTypeSynthesizedMouse);
         m_container->requestTouchEventType(WebPluginContainer::TouchEventRequestTypeRaw);
     }
     m_container->requestTouchEventType(m_touchEventRequest);
     m_container->setWantsWheelEvents(true);
     return true;
 }
 
 void TestPlugin::destroy()
 {
-    if (m_layer.get())
-        m_layer->ClearTexture();
+    if (m_layer.get()) {
+        m_layer->WillModifyTexture();
+        m_layer->SetTextureMailbox(cc::TextureMailbox(),
+                                   scoped_ptr<cc::SingleReleaseCallback>());
+    }
     if (m_container)
         m_container->setWebLayer(0);
     m_webLayer.reset();
     m_layer = NULL;
     destroyScene();
 
     delete m_context;
     m_context = 0;
 
     m_container = 0;
@@ skipping 452 matching lines @@
 }
 
 bool TestPlugin::isSupportedMimeType(const WebString& mimeType)
 {
     return mimeType == TestPlugin::mimeType()
            || mimeType == pluginPersistsMimeType()
            || mimeType == canCreateWithoutRendererMimeType();
 }
 
 }