| 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 "chrome/browser/extensions/extension_browsertest.h" | 5 #include "chrome/browser/extensions/extension_browsertest.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 371 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 382 class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt { | 382 class MockAbortExtensionInstallPrompt : public ExtensionInstallPrompt { |
| 383 public: | 383 public: |
| 384 MockAbortExtensionInstallPrompt() : ExtensionInstallPrompt(NULL) { | 384 MockAbortExtensionInstallPrompt() : ExtensionInstallPrompt(NULL) { |
| 385 } | 385 } |
| 386 | 386 |
| 387 // Simulate a user abort on an extension installation. | 387 // Simulate a user abort on an extension installation. |
| 388 void ConfirmInstall(Delegate* delegate, | 388 void ConfirmInstall(Delegate* delegate, |
| 389 const Extension* extension, | 389 const Extension* extension, |
| 390 const ShowDialogCallback& show_dialog_callback) override { | 390 const ShowDialogCallback& show_dialog_callback) override { |
| 391 delegate->InstallUIAbort(true); | 391 delegate->InstallUIAbort(true); |
| 392 base::MessageLoopForUI::current()->Quit(); | 392 base::MessageLoopForUI::current()->QuitWhenIdle(); |
| 393 } | 393 } |
| 394 | 394 |
| 395 void OnInstallSuccess(const Extension* extension, SkBitmap* icon) override {} | 395 void OnInstallSuccess(const Extension* extension, SkBitmap* icon) override {} |
| 396 | 396 |
| 397 void OnInstallFailure(const extensions::CrxInstallError& error) override {} | 397 void OnInstallFailure(const extensions::CrxInstallError& error) override {} |
| 398 }; | 398 }; |
| 399 | 399 |
| 400 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { | 400 class MockAutoConfirmExtensionInstallPrompt : public ExtensionInstallPrompt { |
| 401 public: | 401 public: |
| 402 explicit MockAutoConfirmExtensionInstallPrompt( | 402 explicit MockAutoConfirmExtensionInstallPrompt( |
| (...skipping 279 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 682 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( | 682 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( |
| 683 profile(), extension_id, script); | 683 profile(), extension_id, script); |
| 684 } | 684 } |
| 685 | 685 |
| 686 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( | 686 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( |
| 687 const std::string& extension_id, | 687 const std::string& extension_id, |
| 688 const std::string& script) { | 688 const std::string& script) { |
| 689 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( | 689 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( |
| 690 profile(), extension_id, script); | 690 profile(), extension_id, script); |
| 691 } | 691 } |
| OLD | NEW |