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 383 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
394 Manifest::INTERNAL, | 394 Manifest::INTERNAL, |
395 browser(), | 395 browser(), |
396 Extension::NO_FLAGS, | 396 Extension::NO_FLAGS, |
397 false, | 397 false, |
398 false); | 398 false); |
399 } | 399 } |
400 | 400 |
401 const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore( | 401 const Extension* ExtensionBrowserTest::InstallExtensionFromWebstore( |
402 const base::FilePath& path, | 402 const base::FilePath& path, |
403 int expected_change) { | 403 int expected_change) { |
404 return InstallOrUpdateExtension( | 404 return InstallOrUpdateExtension(std::string(), |
405 std::string(), path, INSTALL_UI_TYPE_AUTO_CONFIRM, expected_change, | 405 path, |
406 Manifest::INTERNAL, browser(), Extension::FROM_WEBSTORE, true, false); | 406 INSTALL_UI_TYPE_NONE, |
| 407 expected_change, |
| 408 Manifest::INTERNAL, |
| 409 browser(), |
| 410 Extension::FROM_WEBSTORE, |
| 411 true, |
| 412 false); |
407 } | 413 } |
408 | 414 |
409 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension( | 415 const Extension* ExtensionBrowserTest::InstallOrUpdateExtension( |
410 const std::string& id, | 416 const std::string& id, |
411 const base::FilePath& path, | 417 const base::FilePath& path, |
412 InstallUIType ui_type, | 418 InstallUIType ui_type, |
413 int expected_change) { | 419 int expected_change) { |
414 return InstallOrUpdateExtension(id, | 420 return InstallOrUpdateExtension(id, |
415 path, | 421 path, |
416 ui_type, | 422 ui_type, |
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
654 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( | 660 return extensions::browsertest_util::ExecuteScriptInBackgroundPage( |
655 profile(), extension_id, script); | 661 profile(), extension_id, script); |
656 } | 662 } |
657 | 663 |
658 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( | 664 bool ExtensionBrowserTest::ExecuteScriptInBackgroundPageNoWait( |
659 const std::string& extension_id, | 665 const std::string& extension_id, |
660 const std::string& script) { | 666 const std::string& script) { |
661 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( | 667 return extensions::browsertest_util::ExecuteScriptInBackgroundPageNoWait( |
662 profile(), extension_id, script); | 668 profile(), extension_id, script); |
663 } | 669 } |
OLD | NEW |