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

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

Issue 272923003: Re-enable AutomationApiTest.SanityCheck on Mac. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_test_message_listener.h" 9 #include "chrome/browser/extensions/extension_test_message_listener.h"
10 #include "chrome/browser/ui/tabs/tab_strip_model.h" 10 #include "chrome/browser/ui/tabs/tab_strip_model.h"
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 LoadExtension(extension_path); 84 LoadExtension(extension_path);
85 ASSERT_TRUE(got_tree.WaitUntilSatisfied()); 85 ASSERT_TRUE(got_tree.WaitUntilSatisfied());
86 86
87 rwh = tab->GetRenderWidgetHostView()->GetRenderWidgetHost(); 87 rwh = tab->GetRenderWidgetHostView()->GetRenderWidgetHost();
88 ASSERT_NE((content::RenderWidgetHost*)NULL, rwh) 88 ASSERT_NE((content::RenderWidgetHost*)NULL, rwh)
89 << "Couldn't get RenderWidgetHost"; 89 << "Couldn't get RenderWidgetHost";
90 ASSERT_FALSE(rwh->IsFullAccessibilityModeForTesting()); 90 ASSERT_FALSE(rwh->IsFullAccessibilityModeForTesting());
91 ASSERT_TRUE(rwh->IsTreeOnlyAccessibilityModeForTesting()); 91 ASSERT_TRUE(rwh->IsTreeOnlyAccessibilityModeForTesting());
92 } 92 }
93 93
94 // TODO(dtseng): See crbug.com/360297. 94 IN_PROC_BROWSER_TEST_F(AutomationApiTest, SanityCheck) {
95 #if defined(OS_MACOSX)
96 #define MAYBE_SanityCheck DISABLED_SanityCheck
97 #else
98 #define MAYBE_SanityCheck SanityCheck
99 #endif // defined(OS_MACOSX)
100 IN_PROC_BROWSER_TEST_F(AutomationApiTest, MAYBE_SanityCheck) {
101 StartEmbeddedTestServer(); 95 StartEmbeddedTestServer();
102 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "sanity_check.html")) 96 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "sanity_check.html"))
103 << message_; 97 << message_;
104 } 98 }
105 99
106 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Events) { 100 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Events) {
107 LoadPage(); 101 LoadPage();
108 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "events.html")) 102 ASSERT_TRUE(RunExtensionSubtest("automation/tests/tabs", "events.html"))
109 << message_; 103 << message_;
110 } 104 }
(...skipping 11 matching lines...) Expand all
122 } 116 }
123 117
124 #if defined(OS_CHROMEOS) 118 #if defined(OS_CHROMEOS)
125 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Desktop) { 119 IN_PROC_BROWSER_TEST_F(AutomationApiTest, Desktop) {
126 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "desktop.html")) 120 ASSERT_TRUE(RunExtensionSubtest("automation/tests/desktop", "desktop.html"))
127 << message_; 121 << message_;
128 } 122 }
129 #endif 123 #endif
130 124
131 } // namespace extensions 125 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698