cc: Fix nine patch layer resource management bugs.

cc/nine_patch_layer_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 "config.h"
 
 #include "cc/nine_patch_layer.h"
 
 #include "cc/layer_tree_host.h"
 #include "cc/occlusion_tracker.h"
@@ skipping 98 matching lines @@
         DebugScopedSetImplThread implThread;
         DebugScopedSetMainThreadBlocked mainThreadBlocked;
         context = WebKit::createFakeGraphicsContext();
         resourceProvider = ResourceProvider::create(context.get());
         params.texture->acquireBackingTexture(resourceProvider.get());
         ASSERT_TRUE(params.texture->haveBackingTexture());
     }
 
     // Nothing changed, so no repeated upload.
     testLayer->setTexturePriorities(calculator);
-    {
-        DebugScopedSetImplThread implThread;
-        testLayer->update(queue, &occlusionTracker, stats);
-    }
+    testLayer->update(queue, &occlusionTracker, stats);
     EXPECT_EQ(queue.fullUploadSize(), 0);
     EXPECT_EQ(queue.partialUploadSize(), 0);
 
     {
         DebugScopedSetImplThread implThread;
         DebugScopedSetMainThreadBlocked mainThreadBlocked;
         m_layerTreeHost->contentsTextureManager()->clearAllMemory(resourceProvider.get());
     }
 
     // Reupload after eviction
     testLayer->setTexturePriorities(calculator);
-    {
-        DebugScopedSetImplThread implThread;
-        testLayer->update(queue, &occlusionTracker, stats);
-    }
+    testLayer->update(queue, &occlusionTracker, stats);
     EXPECT_EQ(queue.fullUploadSize(), 1);
     EXPECT_EQ(queue.partialUploadSize(), 0);
 }
 
 } // anonymous namespace