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

Unified Diff: chrome/test/ui/npapi_uitest.cc

Issue 194051: Remove unused ATL headers. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/plugin/plugin_test.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/ui/npapi_uitest.cc
===================================================================
--- chrome/test/ui/npapi_uitest.cc (revision 25700)
+++ chrome/test/ui/npapi_uitest.cc (working copy)
@@ -6,7 +6,6 @@
#include <windows.h>
#include <shellapi.h>
#include <shlobj.h>
-#include <atlbase.h>
#include <comutil.h>
// runtime headers
@@ -207,7 +206,7 @@
ASSERT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
&available_buttons));
ASSERT_TRUE(modal_dialog_showing);
- ASSERT_TRUE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons) != 0);
+ ASSERT_NE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons), 0);
ASSERT_TRUE(automation()->ClickAppModalDialogButton(
MessageBoxFlags::DIALOGBUTTON_OK));
@@ -216,7 +215,7 @@
ASSERT_TRUE(automation()->GetShowingAppModalDialog(&modal_dialog_showing,
&available_buttons));
ASSERT_TRUE(modal_dialog_showing);
- ASSERT_TRUE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons) != 0);
+ ASSERT_NE((MessageBoxFlags::DIALOGBUTTON_OK & available_buttons), 0);
ASSERT_TRUE(automation()->ClickAppModalDialogButton(
MessageBoxFlags::DIALOGBUTTON_OK));
}
@@ -244,14 +243,14 @@
}
TEST_F(NPAPIVisiblePluginTester, SelfDeletePluginInNPNEvaluate) {
- if (!UITest::in_process_renderer()) {
+ if (!UITest::in_process_renderer()) {
GURL url = GetTestUrl(L"npapi",
L"execute_script_delete_in_npn_evaluate.html");
NavigateToURL(url);
WaitForFinish("npobject_delete_plugin_in_evaluate", "1", url,
kTestCompleteCookie, kTestCompleteSuccess,
kShortWaitTimeout);
- }
+ }
}
// Flaky. See http://crbug.com/17645
« no previous file with comments | « chrome/test/plugin/plugin_test.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698