Fixing issues with new activity image readback

athena/content/content_proxy.cc

Index: athena/content/content_proxy.cc
diff --git a/athena/content/content_proxy.cc b/athena/content/content_proxy.cc
index 7dce0e9266ec0ede53b7d2f90095e9215afa6245..bcef5444466683811be764ce26d2859f508524df 100644
--- a/athena/content/content_proxy.cc
+++ b/athena/content/content_proxy.cc
@@ -82,12 +82,12 @@ void ContentProxy::ContentWillUnload() {
 
 gfx::ImageSkia ContentProxy::GetContentImage() {
   // While we compress to PNG, we use the original read back.
-  if (!raw_image_.isNull() || !png_data_.get())
+  if (!png_data_.get())
     return raw_image_;
 
   // Otherwise we convert the PNG.
   std::vector<gfx::ImagePNGRep> image_reps;
-  image_reps.push_back(gfx::ImagePNGRep(png_data_, 0.0f));
+  image_reps.push_back(gfx::ImagePNGRep(png_data_, 1.0f));
   return *(gfx::Image(image_reps).ToImageSkia());
 }