Enable disabling WebCore::GraphicsContext in telemetry.

cc/resources/picture_unittest.cc

Index: cc/resources/picture_unittest.cc
diff --git a/cc/resources/picture_unittest.cc b/cc/resources/picture_unittest.cc
index a3910c64fe1d652325b6e2048b3eaa7785033642..7042196760f51f222f4f93e189f15468cd1553b4 100644
--- a/cc/resources/picture_unittest.cc
+++ b/cc/resources/picture_unittest.cc
@@ -463,6 +463,8 @@ TEST(PictureTest, RecordingModes) {
                                                    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,
@@ -472,6 +474,8 @@ TEST(PictureTest, RecordingModes) {
                             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,
@@ -480,7 +484,9 @@ TEST(PictureTest, RecordingModes) {
                             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,