Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / content / browser / devtools / renderer_overrides_handler_browsertest.cc

diff --git a/src/content/browser/devtools/renderer_overrides_handler_browsertest.cc b/src/content/browser/devtools/renderer_overrides_handler_browsertest.cc
index 48ae7c6..fd02c09 100644 (file)
--- a/src/content/browser/devtools/renderer_overrides_handler_browsertest.cc
+++ b/src/content/browser/devtools/renderer_overrides_handler_browsertest.cc
@@ -56,18 +56,18 @@ class RendererOverridesHandlerTest : public ContentBrowserTest,
   scoped_refptr<DevToolsAgentHost> agent_host_;
 
  private:
-  virtual void SetUpOnMainThread() OVERRIDE {
+  void SetUpOnMainThread() override {
     agent_host_ = DevToolsAgentHost::GetOrCreateFor(shell()->web_contents());
     agent_host_->AttachClient(this);
   }
 
-  virtual void TearDownOnMainThread() OVERRIDE {
+  void TearDownOnMainThread() override {
     agent_host_->DetachClient();
     agent_host_ = NULL;
   }
 
-  virtual void DispatchProtocolMessage(
-      DevToolsAgentHost* agent_host, const std::string& message) OVERRIDE {
+  void DispatchProtocolMessage(DevToolsAgentHost* agent_host,
+                               const std::string& message) override {
     scoped_ptr<base::DictionaryValue> root(
         static_cast<base::DictionaryValue*>(base::JSONReader::Read(message)));
     base::DictionaryValue* result;
@@ -76,8 +76,7 @@ class RendererOverridesHandlerTest : public ContentBrowserTest,
     base::MessageLoop::current()->QuitNow();
   }
 
-  virtual void AgentHostClosed(
-      DevToolsAgentHost* agent_host, bool replaced) OVERRIDE {
+  void AgentHostClosed(DevToolsAgentHost* agent_host, bool replaced) override {
     EXPECT_TRUE(false);
   }
 };
@@ -99,7 +98,7 @@ IN_PROC_BROWSER_TEST_F(RendererOverridesHandlerTest, QueryUsageAndQuota) {
 class CaptureScreenshotTest : public RendererOverridesHandlerTest {
  private:
 #if !defined(OS_ANDROID)
-  virtual void SetUpCommandLine(base::CommandLine* command_line) OVERRIDE {
+  void SetUpCommandLine(base::CommandLine* command_line) override {
     command_line->AppendSwitch(switches::kEnablePixelOutputInTests);
   }
 #endif
@@ -108,6 +107,11 @@ class CaptureScreenshotTest : public RendererOverridesHandlerTest {
 // Does not link on Android
 #if defined(OS_ANDROID)
 #define MAYBE_CaptureScreenshot DISABLED_CaptureScreenshot
+#elif defined(OS_MACOSX)  // Fails on 10.9. http://crbug.com/430620
+#define MAYBE_CaptureScreenshot DISABLED_CaptureScreenshot
+#elif defined(MEMORY_SANITIZER)
+// Also fails under MSAN. http://crbug.com/423583
+#define MAYBE_CaptureScreenshot DISABLED_CaptureScreenshot
 #else
 #define MAYBE_CaptureScreenshot CaptureScreenshot
 #endif