Enable disabling WebCore::GraphicsContext in telemetry.

cc/resources/picture_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 "cc/resources/picture.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "cc/test/fake_content_layer_client.h"
@@ skipping 445 matching lines @@
   FakeContentLayerClient content_layer_client;
   EXPECT_EQ(NULL, content_layer_client.last_canvas());
 
   scoped_refptr<Picture> picture = Picture::Create(layer_rect,
                                                    &content_layer_client,
                                                    tile_grid_info,
                                                    false,
                                                    0,
                                                    Picture::RECORD_NORMALLY);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+  EXPECT_TRUE(content_layer_client.last_context_status() ==

[danakj, 2014/05/01 17:07:11]

nit: EXPECT_EQ(expected,actual) here and below?

[Stephen Chennney, 2014/05/01 19:12:26]

Done.

+              ContentLayerClient::GraphicsContextEnabled);
   EXPECT_TRUE(picture);
 
   picture = Picture::Create(layer_rect,
                             &content_layer_client,
                             tile_grid_info,
                             false,
                             0,
                             Picture::RECORD_WITH_SK_NULL_CANVAS);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+  EXPECT_TRUE(content_layer_client.last_context_status() ==
+              ContentLayerClient::GraphicsContextEnabled);
   EXPECT_TRUE(picture);
 
   picture = Picture::Create(layer_rect,
                             &content_layer_client,
                             tile_grid_info,
                             false,
                             0,
                             Picture::RECORD_WITH_PAINTING_DISABLED);
-  EXPECT_EQ(NULL, content_layer_client.last_canvas());
+  EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
+  EXPECT_TRUE(content_layer_client.last_context_status() ==
+              ContentLayerClient::GraphicsContextDisabled);

[Sami, 2014/05/01 16:32:53]

Thanks for improving the test.

   EXPECT_TRUE(picture);
 
   picture = Picture::Create(layer_rect,
                             &content_layer_client,
                             tile_grid_info,
                             false,
                             0,
                             Picture::RECORD_WITH_SKRECORD);
   EXPECT_TRUE(content_layer_client.last_canvas() != NULL);
   EXPECT_TRUE(picture);
 
   EXPECT_EQ(4, Picture::RECORDING_MODE_COUNT);
 }
 
 }  // namespace
 }  // namespace cc