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

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

Issue 242613004: Replace NOTIFICATION_EXTENSION_LOADED to NOTIFICATION_EXTENSION_LOADED_DEPRECATED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 years, 8 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
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 "chrome/browser/chrome_notification_types.h" 5 #include "chrome/browser/chrome_notification_types.h"
6 #include "chrome/browser/extensions/crx_installer.h" 6 #include "chrome/browser/extensions/crx_installer.h"
7 #include "chrome/browser/extensions/extension_browsertest.h" 7 #include "chrome/browser/extensions/extension_browsertest.h"
8 #include "chrome/browser/extensions/extension_service.h" 8 #include "chrome/browser/extensions/extension_service.h"
9 #include "chrome/browser/extensions/extension_util.h" 9 #include "chrome/browser/extensions/extension_util.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/ui/browser_commands.h" 11 #include "chrome/browser/ui/browser_commands.h"
12 #include "chrome/test/base/ui_test_utils.h" 12 #include "chrome/test/base/ui_test_utils.h"
13 #include "content/public/browser/notification_service.h" 13 #include "content/public/browser/notification_service.h"
14 14
15 namespace extensions { 15 namespace extensions {
16 16
17 class ExtensionFunctionalTest : public ExtensionBrowserTest { 17 class ExtensionFunctionalTest : public ExtensionBrowserTest {
18 public: 18 public:
19 void InstallExtensionSilently(ExtensionService* service, 19 void InstallExtensionSilently(ExtensionService* service,
20 const char* filename) { 20 const char* filename) {
21 service->set_show_extensions_prompts(false); 21 service->set_show_extensions_prompts(false);
22 size_t num_before = service->extensions()->size(); 22 size_t num_before = service->extensions()->size();
23 23
24 base::FilePath path = test_data_dir_.AppendASCII(filename); 24 base::FilePath path = test_data_dir_.AppendASCII(filename);
25 25
26 content::WindowedNotificationObserver extension_loaded_observer( 26 content::WindowedNotificationObserver extension_loaded_observer(
27 chrome::NOTIFICATION_EXTENSION_LOADED, 27 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
28 content::NotificationService::AllSources()); 28 content::NotificationService::AllSources());
29 29
30 scoped_refptr<extensions::CrxInstaller> installer( 30 scoped_refptr<extensions::CrxInstaller> installer(
31 extensions::CrxInstaller::CreateSilent(service)); 31 extensions::CrxInstaller::CreateSilent(service));
32 installer->set_is_gallery_install(false); 32 installer->set_is_gallery_install(false);
33 installer->set_allow_silent_install(true); 33 installer->set_allow_silent_install(true);
34 installer->set_install_source(Manifest::INTERNAL); 34 installer->set_install_source(Manifest::INTERNAL);
35 installer->set_off_store_install_allow_reason( 35 installer->set_off_store_install_allow_reason(
36 extensions::CrxInstaller::OffStoreInstallAllowedInTest); 36 extensions::CrxInstaller::OffStoreInstallAllowedInTest);
37 37
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 service->EnableExtension(last_loaded_extension_id()); 85 service->EnableExtension(last_loaded_extension_id());
86 util::SetIsIncognitoEnabled(last_loaded_extension_id(), profile(), true); 86 util::SetIsIncognitoEnabled(last_loaded_extension_id(), profile(), true);
87 EXPECT_TRUE(util::IsIncognitoEnabled(last_loaded_extension_id(), profile())); 87 EXPECT_TRUE(util::IsIncognitoEnabled(last_loaded_extension_id(), profile()));
88 88
89 // Disallow extension in incognito mode and verify. 89 // Disallow extension in incognito mode and verify.
90 service->EnableExtension(last_loaded_extension_id()); 90 service->EnableExtension(last_loaded_extension_id());
91 util::SetIsIncognitoEnabled(last_loaded_extension_id(), profile(), false); 91 util::SetIsIncognitoEnabled(last_loaded_extension_id(), profile(), false);
92 EXPECT_FALSE(util::IsIncognitoEnabled(last_loaded_extension_id(), profile())); 92 EXPECT_FALSE(util::IsIncognitoEnabled(last_loaded_extension_id(), profile()));
93 } 93 }
94 } // namespace extensions 94 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_disabled_ui.cc ('k') | chrome/browser/extensions/extension_gcm_app_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698