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

Side by Side Diff: chrome/browser/extensions/crx_installer_browsertest.cc

Issue 425303002: Move extension notifications to extensions/browser/notification_types.h (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: (extension-notifications) rebase Created 6 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
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 "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/memory/ref_counted.h" 6 #include "base/memory/ref_counted.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "chrome/browser/download/download_crx_util.h" 8 #include "chrome/browser/download/download_crx_util.h"
9 #include "chrome/browser/extensions/browser_action_test_util.h" 9 #include "chrome/browser/extensions/browser_action_test_util.h"
10 #include "chrome/browser/extensions/crx_installer.h" 10 #include "chrome/browser/extensions/crx_installer.h"
11 #include "chrome/browser/extensions/extension_browsertest.h" 11 #include "chrome/browser/extensions/extension_browsertest.h"
12 #include "chrome/browser/extensions/extension_install_prompt.h" 12 #include "chrome/browser/extensions/extension_install_prompt.h"
13 #include "chrome/browser/extensions/extension_service.h" 13 #include "chrome/browser/extensions/extension_service.h"
14 #include "chrome/browser/extensions/extension_util.h" 14 #include "chrome/browser/extensions/extension_util.h"
15 #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h" 15 #include "chrome/browser/extensions/fake_safe_browsing_database_manager.h"
16 #include "chrome/browser/profiles/profile.h" 16 #include "chrome/browser/profiles/profile.h"
17 #include "chrome/browser/ui/browser.h" 17 #include "chrome/browser/ui/browser.h"
18 #include "chrome/browser/ui/browser_window.h" 18 #include "chrome/browser/ui/browser_window.h"
19 #include "chrome/browser/ui/tabs/tab_strip_model.h" 19 #include "chrome/browser/ui/tabs/tab_strip_model.h"
20 #include "chrome/test/base/ui_test_utils.h" 20 #include "chrome/test/base/ui_test_utils.h"
21 #include "content/public/browser/browser_thread.h" 21 #include "content/public/browser/browser_thread.h"
22 #include "content/public/browser/download_manager.h" 22 #include "content/public/browser/download_manager.h"
23 #include "content/public/browser/render_view_host.h" 23 #include "content/public/browser/render_view_host.h"
24 #include "content/public/test/browser_test_utils.h" 24 #include "content/public/test/browser_test_utils.h"
25 #include "content/public/test/download_test_observer.h" 25 #include "content/public/test/download_test_observer.h"
26 #include "extensions/browser/extension_prefs.h" 26 #include "extensions/browser/extension_prefs.h"
27 #include "extensions/browser/extension_system.h" 27 #include "extensions/browser/extension_system.h"
28 #include "extensions/browser/management_policy.h" 28 #include "extensions/browser/management_policy.h"
29 #include "extensions/browser/notification_types.h"
29 #include "extensions/common/extension.h" 30 #include "extensions/common/extension.h"
30 #include "extensions/common/feature_switch.h" 31 #include "extensions/common/feature_switch.h"
31 #include "extensions/common/file_util.h" 32 #include "extensions/common/file_util.h"
32 #include "extensions/common/permissions/permission_set.h" 33 #include "extensions/common/permissions/permission_set.h"
33 #include "extensions/common/switches.h" 34 #include "extensions/common/switches.h"
34 #include "grit/generated_resources.h" 35 #include "grit/generated_resources.h"
35 #include "ui/base/l10n/l10n_util.h" 36 #include "ui/base/l10n/l10n_util.h"
36 37
37 #if defined(OS_CHROMEOS) 38 #if defined(OS_CHROMEOS)
38 #include "chrome/browser/chromeos/login/users/fake_user_manager.h" 39 #include "chrome/browser/chromeos/login/users/fake_user_manager.h"
(...skipping 378 matching lines...) Expand 10 before | Expand all | Expand 10 after
417 ASSERT_TRUE(InstallExtension(crx_path.AppendASCII("v1.crx"), 1)); 418 ASSERT_TRUE(InstallExtension(crx_path.AppendASCII("v1.crx"), 1));
418 const extensions::Extension* extension = 419 const extensions::Extension* extension =
419 service->GetExtensionById(extension_id, false); 420 service->GetExtensionById(extension_id, false);
420 ASSERT_TRUE(extension); 421 ASSERT_TRUE(extension);
421 ASSERT_EQ(extension_id, extension->id()); 422 ASSERT_EQ(extension_id, extension->id());
422 ASSERT_EQ("1.0", extension->version()->GetString()); 423 ASSERT_EQ("1.0", extension->version()->GetString());
423 424
424 // Make test extension non-idle by opening the extension's browser action 425 // Make test extension non-idle by opening the extension's browser action
425 // popup. This should cause the installation to be delayed. 426 // popup. This should cause the installation to be delayed.
426 content::WindowedNotificationObserver loading_observer( 427 content::WindowedNotificationObserver loading_observer(
427 chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING, 428 extensions::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
428 content::Source<Profile>(profile())); 429 content::Source<Profile>(profile()));
429 BrowserActionTestUtil util(browser()); 430 BrowserActionTestUtil util(browser());
430 // There is only one extension, so just click the first browser action. 431 // There is only one extension, so just click the first browser action.
431 ASSERT_EQ(1, util.NumberOfBrowserActions()); 432 ASSERT_EQ(1, util.NumberOfBrowserActions());
432 util.Press(0); 433 util.Press(0);
433 loading_observer.Wait(); 434 loading_observer.Wait();
434 ExtensionHost* extension_host = 435 ExtensionHost* extension_host =
435 content::Details<ExtensionHost>(loading_observer.details()).ptr(); 436 content::Details<ExtensionHost>(loading_observer.details()).ptr();
436 437
437 // Install version 2 of the extension and check that it is indeed delayed. 438 // Install version 2 of the extension and check that it is indeed delayed.
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
571 ManagementPolicyMock policy; 572 ManagementPolicyMock policy;
572 extensions::ExtensionSystem::Get(profile()) 573 extensions::ExtensionSystem::Get(profile())
573 ->management_policy() 574 ->management_policy()
574 ->RegisterProvider(&policy); 575 ->RegisterProvider(&policy);
575 576
576 base::FilePath crx_path = test_data_dir_.AppendASCII("crx_installer/v1.crx"); 577 base::FilePath crx_path = test_data_dir_.AppendASCII("crx_installer/v1.crx");
577 EXPECT_FALSE(InstallExtension(crx_path, 0)); 578 EXPECT_FALSE(InstallExtension(crx_path, 0));
578 } 579 }
579 580
580 } // namespace extensions 581 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/crx_installer.cc ('k') | chrome/browser/extensions/extension_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698