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

Unified Diff: chrome/browser/intents/native_services_unittest.cc

Issue 11071005: Add native file picker impl using SelectFileDialog. (Closed) Base URL: http://git.chromium.org/chromium/src.git@filePicker
Patch Set: Don't use "DeleteService" as a method name since Windows munges it at compile time. Created 8 years, 2 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
Index: chrome/browser/intents/native_services_unittest.cc
diff --git a/chrome/browser/intents/native_services_unittest.cc b/chrome/browser/intents/native_services_unittest.cc
index 92106130cb6cd5bbbcec641ecb081fb7cc9cb1dd..7b4f8dd3cc6f775b00f0f9549bc58c9debadd2ad 100644
--- a/chrome/browser/intents/native_services_unittest.cc
+++ b/chrome/browser/intents/native_services_unittest.cc
@@ -18,8 +18,7 @@
namespace {
TEST(NativeServiceRegistryTest, GetSupportedServices) {
-#if defined(TOOLKIT_VIEWS)
-
+#if !defined(ANDROID)
// enable native services feature, then check results again
CommandLine::ForCurrentProcess()->AppendSwitch(
switches::kWebIntentsNativeServicesEnabled);
@@ -39,13 +38,11 @@ TEST(NativeServiceRegistryTest, GetSupportedServices) {
// verify the service returned is for "pick"
EXPECT_EQ(ASCIIToUTF16(web_intents::kActionPick), services[0].action);
EXPECT_EQ(GURL(web_intents::kNativeFilePickerUrl), services[0].service_url);
-
#endif
}
TEST(NativeServiceRegistryTest, GetSupportedServicesDisabled) {
-#if defined(TOOLKIT_VIEWS)
-
+#if !defined(ANDROID)
std::vector<webkit_glue::WebIntentServiceData> services;
web_intents::NativeServiceRegistry registry;
@@ -53,7 +50,6 @@ TEST(NativeServiceRegistryTest, GetSupportedServicesDisabled) {
ASCIIToUTF16(web_intents::kActionPick), &services);
ASSERT_EQ(0U, services.size());
-
#endif
}
« no previous file with comments | « chrome/browser/intents/native_services_browsertest.cc ('k') | chrome/browser/ui/intents/native_file_picker_service.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698