| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 <vector> | 5 #include <vector> |
| 6 | 6 |
| 7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
| 8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
| 9 #include "base/stringprintf.h" | 9 #include "base/stringprintf.h" |
| 10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
| (...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 344 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, | 344 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, |
| 345 MAYBE_AppInstallBubble) { | 345 MAYBE_AppInstallBubble) { |
| 346 WebstoreInstallListener listener; | 346 WebstoreInstallListener listener; |
| 347 WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(&listener); | 347 WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(&listener); |
| 348 ASSERT_TRUE(RunInstallTest("app_install_bubble.html", "app.crx")); | 348 ASSERT_TRUE(RunInstallTest("app_install_bubble.html", "app.crx")); |
| 349 listener.Wait(); | 349 listener.Wait(); |
| 350 ASSERT_TRUE(listener.received_success()); | 350 ASSERT_TRUE(listener.received_success()); |
| 351 ASSERT_EQ("iladmdjkfniedhfhcfoefgojhgaiaccc", listener.id()); | 351 ASSERT_EQ("iladmdjkfniedhfhcfoefgojhgaiaccc", listener.id()); |
| 352 } | 352 } |
| 353 | 353 |
| 354 // Fails often on Windows dbg bots. http://crbug.com/177163 |
| 355 #if defined(OS_WIN) |
| 356 #define MAYBE_IconUrl DISABLED_IconUrl |
| 357 #else |
| 358 #define MAYBE_IconUrl IconUrl |
| 359 #endif // defined(OS_WIN) |
| 354 // Tests using the iconUrl parameter to the install function. | 360 // Tests using the iconUrl parameter to the install function. |
| 355 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, IconUrl) { | 361 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, MAYBE_IconUrl) { |
| 356 ASSERT_TRUE(RunInstallTest("icon_url.html", "extension.crx")); | 362 ASSERT_TRUE(RunInstallTest("icon_url.html", "extension.crx")); |
| 357 } | 363 } |
| 358 | 364 |
| 359 // Tests that the Approvals are properly created in beginInstall. | 365 // Tests that the Approvals are properly created in beginInstall. |
| 360 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, BeginInstall) { | 366 IN_PROC_BROWSER_TEST_F(ExtensionWebstorePrivateApiTest, BeginInstall) { |
| 361 std::string appId = "iladmdjkfniedhfhcfoefgojhgaiaccc"; | 367 std::string appId = "iladmdjkfniedhfhcfoefgojhgaiaccc"; |
| 362 std::string extensionId = "enfkhcelefdadlmkffamgdlgplcionje"; | 368 std::string extensionId = "enfkhcelefdadlmkffamgdlgplcionje"; |
| 363 ASSERT_TRUE(RunInstallTest("begin_install.html", "extension.crx")); | 369 ASSERT_TRUE(RunInstallTest("begin_install.html", "extension.crx")); |
| 364 | 370 |
| 365 scoped_ptr<WebstoreInstaller::Approval> approval = | 371 scoped_ptr<WebstoreInstaller::Approval> approval = |
| (...skipping 122 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 488 content::GpuDataManager::GetInstance()->InitializeForTesting( | 494 content::GpuDataManager::GetInstance()->InitializeForTesting( |
| 489 json_blacklist, gpu_info); | 495 json_blacklist, gpu_info); |
| 490 EXPECT_TRUE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted( | 496 EXPECT_TRUE(content::GpuDataManager::GetInstance()->IsFeatureBlacklisted( |
| 491 gpu::GPU_FEATURE_TYPE_WEBGL)); | 497 gpu::GPU_FEATURE_TYPE_WEBGL)); |
| 492 | 498 |
| 493 bool webgl_allowed = false; | 499 bool webgl_allowed = false; |
| 494 RunTest(webgl_allowed); | 500 RunTest(webgl_allowed); |
| 495 } | 501 } |
| 496 | 502 |
| 497 } // namespace extensions | 503 } // namespace extensions |
| OLD | NEW |