Update from https://crrev.com/302630

cc/surfaces/surface_factory_unittest.cc

 // Copyright 2014 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/output/compositor_frame.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_factory_client.h"
 #include "cc/surfaces/surface_manager.h"
@@ skipping 24 matching lines @@
 
   DISALLOW_COPY_AND_ASSIGN(TestSurfaceFactoryClient);
 };
 
 class SurfaceFactoryTest : public testing::Test {
  public:
   SurfaceFactoryTest() : factory_(&manager_, &client_), surface_id_(3) {
     factory_.Create(surface_id_, gfx::Size(5, 5));
   }
 
-  virtual ~SurfaceFactoryTest() { factory_.Destroy(surface_id_); }
+  virtual ~SurfaceFactoryTest() {
+    if (!surface_id_.is_null())
+      factory_.Destroy(surface_id_);
+  }
 
   void SubmitFrameWithResources(ResourceProvider::ResourceId* resource_ids,
                                 size_t num_resource_ids) {
     scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
     for (size_t i = 0u; i < num_resource_ids; ++i) {
       TransferableResource resource;
       resource.id = resource_ids[i];
       resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
       frame_data->resource_list.push_back(resource);
     }
@@ skipping 292 matching lines @@
   {
     SCOPED_TRACE("fourth frame, second unref");
     ResourceProvider::ResourceId expected_returned_ids[] = {12, 13};
     int expected_returned_counts[] = {2, 2};
     CheckReturnedResourcesMatchExpected(expected_returned_ids,
                                         expected_returned_counts,
                                         arraysize(expected_returned_counts));
   }
 }
 
-// Tests shutting down the factory with a surface with outstanding refs still in
-// the map.
-TEST_F(SurfaceFactoryTest, DestroyWithResourceRefs) {
+// Tests doing a DestroyAll before shutting down the factory;
+TEST_F(SurfaceFactoryTest, DestroyAll) {
   SurfaceId id(7);
   factory_.Create(id, gfx::Size(1, 1));
 
   scoped_ptr<DelegatedFrameData> frame_data(new DelegatedFrameData);
   TransferableResource resource;
   resource.id = 1;
   resource.mailbox_holder.texture_target = GL_TEXTURE_2D;
   frame_data->resource_list.push_back(resource);
   scoped_ptr<CompositorFrame> frame(new CompositorFrame);
   frame->delegated_frame_data = frame_data.Pass();
   factory_.SubmitFrame(id, frame.Pass(), base::Closure());
+
+  surface_id_ = SurfaceId();
+  factory_.DestroyAll();
 }
 
 TEST_F(SurfaceFactoryTest, DestroySequence) {
   SurfaceId id2(5);
   factory_.Create(id2, gfx::Size(5, 5));
 
   // Check that waiting before the sequence is satisfied works.
   std::set<SurfaceSequence> sequence;
   sequence.insert(SurfaceSequence(0, 4));
   factory_.DestroyOnSequence(id2, sequence);
@@ skipping 11 matching lines @@
   factory_.Create(id2, gfx::Size(5, 5));
   sequence.clear();
   sequence.insert(SurfaceSequence(0, 6));
   DCHECK(manager_.GetSurfaceForId(id2));
   factory_.DestroyOnSequence(id2, sequence);
   DCHECK(!manager_.GetSurfaceForId(id2));
 }
 
 }  // namespace
 }  // namespace cc