Make ChromeOS screenshots use async readback path

chrome/browser/policy/policy_browsertest.cc

 // Copyright (c) 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 <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 128 matching lines @@
 #include "url/gurl.h"
 
 #if defined(OS_CHROMEOS)
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/accelerators/accelerator_table.h"
 #include "ash/magnifier/magnifier_constants.h"
 #include "ash/shell.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
 #include "chrome/browser/profiles/profile_manager.h"
+#include "chrome/browser/ui/ash/screenshot_taker.h"
 #include "chromeos/audio/cras_audio_handler.h"
 #endif
 
 #if !defined(OS_MACOSX)
 #include "apps/shell_window.h"
 #include "apps/shell_window_registry.h"
 #include "apps/ui/native_app_window.h"
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "chrome/browser/ui/extensions/application_launch.h"
@@ skipping 460 matching lines @@
 
   void SetScreenshotPolicy(bool enabled) {
     PolicyMap policies;
     policies.Set(key::kDisableScreenshots,
                  POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,
                  base::Value::CreateBooleanValue(!enabled), NULL);
     UpdateProviderPolicy(policies);
   }
 
 #if defined(OS_CHROMEOS)
+  class QuitMessageLoopAfterScreenshot : public ScreenshotTakerObserver {
+   public:
+    virtual void OnScreenshotCompleted(
+        ScreenshotTakerObserver::Result screenshot_result,
+        const base::FilePath& screenshot_path) OVERRIDE {
+      BrowserThread::PostTaskAndReply(BrowserThread::IO,
+                                      FROM_HERE,
+                                      base::Bind(base::DoNothing),
+                                      base::MessageLoop::QuitClosure());
+    }
+
+    virtual ~QuitMessageLoopAfterScreenshot() {}
+  };
+
   void TestScreenshotFile(bool enabled) {
+    // AddObserver is an ash-specific method, so just replace the screenshot
+    // taker with one we've created here.
+    scoped_ptr<ScreenshotTaker> screenshot_taker(new ScreenshotTaker);
+    // ScreenshotTaker doesn't own this observer, so the observer's lifetime
+    // is tied to the test instead.
+    screenshot_taker->AddObserver(&observer_);
+    ash::Shell::GetInstance()->accelerator_controller()->SetScreenshotDelegate(
+        screenshot_taker.PassAs<ash::ScreenshotDelegate>());
+
     SetScreenshotPolicy(enabled);
     ash::Shell::GetInstance()->accelerator_controller()->PerformAction(
         ash::TAKE_SCREENSHOT, ui::Accelerator());
 
-    // TAKE_SCREENSHOT handler posts write file task on success, wait for it.
-    BrowserThread::PostTaskAndReply(
-        BrowserThread::IO,
-        FROM_HERE,
-        base::Bind(base::DoNothing),
-        base::MessageLoop::QuitClosure());
     content::RunMessageLoop();
   }
 #endif
 
   ExtensionService* extension_service() {
     extensions::ExtensionSystem* system =
         extensions::ExtensionSystem::Get(browser()->profile());
     return system->extension_service();
   }
 
@@ skipping 64 matching lines @@
     click_event.button = blink::WebMouseEvent::ButtonLeft;
     click_event.clickCount = 1;
     click_event.x = x;
     click_event.y = y;
     contents->GetRenderViewHost()->ForwardMouseEvent(click_event);
     click_event.type = blink::WebInputEvent::MouseUp;
     contents->GetRenderViewHost()->ForwardMouseEvent(click_event);
   }
 
   MockConfigurationPolicyProvider provider_;
+#if defined(OS_CHROMEOS)
+  QuitMessageLoopAfterScreenshot observer_;
+#endif
 };
 
 #if defined(OS_WIN)
 // This policy only exists on Windows.
 
 // Sets the locale policy before the browser is started.
 class LocalePolicyTest : public PolicyTest {
  public:
   LocalePolicyTest() {}
   virtual ~LocalePolicyTest() {}
@@ skipping 2189 matching lines @@
   PrefService* prefs = browser()->profile()->GetPrefs();
   EXPECT_TRUE(extensions::NativeMessageProcessHost::IsHostAllowed(
       prefs, "host.name"));
   EXPECT_FALSE(extensions::NativeMessageProcessHost::IsHostAllowed(
       prefs, "other.host.name"));
 }
 
 #endif  // !defined(CHROME_OS)
 
 }  // namespace policy