| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "base/files/file_path.h" | 5 #include "base/files/file_path.h" |
| 6 #include "base/path_service.h" | 6 #include "base/path_service.h" |
| 7 #include "base/strings/string_number_conversions.h" | 7 #include "base/strings/string_number_conversions.h" |
| 8 #include "chrome/browser/extensions/api/automation_internal/automation_util.h" | 8 #include "chrome/browser/extensions/api/automation_internal/automation_util.h" |
| 9 #include "chrome/browser/extensions/chrome_extension_function.h" | 9 #include "chrome/browser/extensions/chrome_extension_function.h" |
| 10 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 199 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "find.html")) | 199 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "find.html")) |
| 200 << message_; | 200 << message_; |
| 201 } | 201 } |
| 202 | 202 |
| 203 // Flaky on Linux only. http://crbug.com/467921 | 203 // Flaky on Linux only. http://crbug.com/467921 |
| 204 #if defined(OS_LINUX) | 204 #if defined(OS_LINUX) |
| 205 #define MAYBE_Mixins DISABLED_Mixins | 205 #define MAYBE_Mixins DISABLED_Mixins |
| 206 #else | 206 #else |
| 207 #define MAYBE_Mixins Mixins | 207 #define MAYBE_Mixins Mixins |
| 208 #endif | 208 #endif |
| 209 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Mixins) { | 209 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DISABLED_Mixins) { |
| 210 StartEmbeddedTestServer(); | 210 StartEmbeddedTestServer(); |
| 211 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "mixins.html")) | 211 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "mixins.html")) |
| 212 << message_; | 212 << message_; |
| 213 } | 213 } |
| 214 | 214 |
| 215 | 215 |
| 216 static const int kPid = 1; | 216 static const int kPid = 1; |
| 217 static const int kTab0Rid = 1; | 217 static const int kTab0Rid = 1; |
| 218 static const int kTab1Rid = 2; | 218 static const int kTab1Rid = 2; |
| 219 | 219 |
| (...skipping 311 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 531 "automationInternal.enableTab", | 531 "automationInternal.enableTab", |
| 532 FakeAutomationInternalEnableTabFunctionFactory)); | 532 FakeAutomationInternalEnableTabFunctionFactory)); |
| 533 ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction( | 533 ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction( |
| 534 "automationInternal.performAction", | 534 "automationInternal.performAction", |
| 535 FakeAutomationInternalPerformActionFunctionFactory)); | 535 FakeAutomationInternalPerformActionFunctionFactory)); |
| 536 ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated", | 536 ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated", |
| 537 "generated_trees.html")) << message_; | 537 "generated_trees.html")) << message_; |
| 538 } | 538 } |
| 539 | 539 |
| 540 } // namespace extensions | 540 } // namespace extensions |
| OLD | NEW |