Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(368)

Side by Side Diff: chrome/browser/extensions/api/automation/automation_apitest.cc

Issue 1003283002: Enable chrome.automation.getDesktop on all aura platforms. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
154 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) { 154 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopActions) {
155 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html")) 155 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "actions.html"))
156 << message_; 156 << message_;
157 } 157 }
158 158
159 // http://crbug.com/435449 159 // http://crbug.com/435449
160 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopLoadTabs) { 160 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopLoadTabs) {
161 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "load_tabs.html")) 161 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "load_tabs.html"))
162 << message_; 162 << message_;
163 } 163 }
164
164 #else 165 #else
165 IN_PROC_BROWSER_TEST_F(AutomationApiTest, DesktopNotSupported) { 166 IN_PROC_BROWSER_TEST_F(AutomationApiTest, LazyDesktop) {
166 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", 167 ASSERT_TRUE(
167 "desktop_not_supported.html")) << message_; 168 RunExtensionSubtest("automation/tests/desktop", "lazy_desktop.html"))
169 << message_;
168 } 170 }
169 #endif 171 #endif
170 172
171 IN_PROC_BROWSER_TEST_F(AutomationApiTest, CloseTab) { 173 IN_PROC_BROWSER_TEST_F(AutomationApiTest, CloseTab) {
172 StartEmbeddedTestServer(); 174 StartEmbeddedTestServer();
173 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "close_tab.html")) 175 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "close_tab.html"))
174 << message_; 176 << message_;
175 } 177 }
176 178
177 IN_PROC_BROWSER_TEST_F(AutomationApiTest, QuerySelector) { 179 IN_PROC_BROWSER_TEST_F(AutomationApiTest, QuerySelector) {
(...skipping 334 matching lines...) Expand 10 before | Expand all | Expand 10 after
512 "automationInternal.enableTab", 514 "automationInternal.enableTab",
513 FakeAutomationInternalEnableTabFunctionFactory)); 515 FakeAutomationInternalEnableTabFunctionFactory));
514 ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction( 516 ASSERT_TRUE(extensions::ExtensionFunctionDispatcher::OverrideFunction(
515 "automationInternal.performAction", 517 "automationInternal.performAction",
516 FakeAutomationInternalPerformActionFunctionFactory)); 518 FakeAutomationInternalPerformActionFunctionFactory));
517 ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated", 519 ASSERT_TRUE(RunExtensionSubtest("automation/tests/generated",
518 "generated_trees.html")) << message_; 520 "generated_trees.html")) << message_;
519 } 521 }
520 522
521 } // namespace extensions 523 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698