| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/stringprintf.h" | 5 #include "base/stringprintf.h" |
| 6 #if defined (OS_WIN) | 6 #if defined (OS_WIN) |
| 7 #include "base/win/windows_version.h" | 7 #include "base/win/windows_version.h" |
| 8 #endif // defined (OS_WIN) | 8 #endif // defined (OS_WIN) |
| 9 | 9 |
| 10 #include "chrome/browser/extensions/extension_apitest.h" | 10 #include "chrome/browser/extensions/extension_apitest.h" |
| 11 #include "chrome/browser/extensions/extension_webstore_private_api.h" | 11 #include "chrome/browser/extensions/extension_webstore_private_api.h" |
| 12 #include "chrome/common/chrome_notification_types.h" | 12 #include "chrome/common/chrome_notification_types.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "chrome/test/ui_test_utils.h" | 14 #include "chrome/test/base/ui_test_utils.h" |
| 15 #include "content/common/notification_observer.h" | 15 #include "content/common/notification_observer.h" |
| 16 #include "content/common/notification_registrar.h" | 16 #include "content/common/notification_registrar.h" |
| 17 #include "content/common/notification_service.h" | 17 #include "content/common/notification_service.h" |
| 18 #include "net/base/mock_host_resolver.h" | 18 #include "net/base/mock_host_resolver.h" |
| 19 | 19 |
| 20 // This is a helper class to let us automatically accept extension install | 20 // This is a helper class to let us automatically accept extension install |
| 21 // dialogs. | 21 // dialogs. |
| 22 class GalleryInstallApiTestObserver : | 22 class GalleryInstallApiTestObserver : |
| 23 public base::RefCounted<GalleryInstallApiTestObserver>, | 23 public base::RefCounted<GalleryInstallApiTestObserver>, |
| 24 public NotificationObserver { | 24 public NotificationObserver { |
| (...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 ASSERT_TRUE(RunInstallTest("test.html")); | 114 ASSERT_TRUE(RunInstallTest("test.html")); |
| 115 ASSERT_TRUE(RunInstallTest("complete_without_begin.html")); | 115 ASSERT_TRUE(RunInstallTest("complete_without_begin.html")); |
| 116 ASSERT_TRUE(RunInstallTest("invalid_begin.html")); | 116 ASSERT_TRUE(RunInstallTest("invalid_begin.html")); |
| 117 | 117 |
| 118 if (RunningOnXP()) { | 118 if (RunningOnXP()) { |
| 119 LOG(INFO) << "Starting tests with user gesture checking"; | 119 LOG(INFO) << "Starting tests with user gesture checking"; |
| 120 } | 120 } |
| 121 BeginInstallFunction::SetIgnoreUserGestureForTests(false); | 121 BeginInstallFunction::SetIgnoreUserGestureForTests(false); |
| 122 ASSERT_TRUE(RunInstallTest("no_user_gesture.html")); | 122 ASSERT_TRUE(RunInstallTest("no_user_gesture.html")); |
| 123 } | 123 } |
| OLD | NEW |