chrome/browser/extensions/extension_service_unittest.cc - Issue 10933044: Move chrome/browser/plugin_* to chrome/browser/plugins/

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

Issue 10933044: Move chrome/browser/plugin_* to chrome/browser/plugins/ (Closed) Base URL: http://git.chromium.org/chromium/src.git@remove_plugin_group

Patch Set: . Created 8 years, 3 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

« no previous file with comments | « chrome/browser/extensions/api/content_settings/content_settings_api.cc ('k') | chrome/browser/metrics/metrics_log.cc » ('j') | no next file with comments »

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_service_unittest.h"	5 #include "chrome/browser/extensions/extension_service_unittest.h"

6	6

7 #include <algorithm>	7 #include <algorithm>

8 #include <set>	8 #include <set>

9 #include <vector>	9 #include <vector>

10	10

(...skipping 31 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
42 #include "chrome/browser/extensions/external_provider_impl.h"	42 #include "chrome/browser/extensions/external_provider_impl.h"

43 #include "chrome/browser/extensions/external_provider_interface.h"	43 #include "chrome/browser/extensions/external_provider_interface.h"

44 #include "chrome/browser/extensions/installed_loader.h"	44 #include "chrome/browser/extensions/installed_loader.h"

45 #include "chrome/browser/extensions/pack_extension_job.h"	45 #include "chrome/browser/extensions/pack_extension_job.h"

46 #include "chrome/browser/extensions/pending_extension_info.h"	46 #include "chrome/browser/extensions/pending_extension_info.h"

47 #include "chrome/browser/extensions/pending_extension_manager.h"	47 #include "chrome/browser/extensions/pending_extension_manager.h"

48 #include "chrome/browser/extensions/test_extension_system.h"	48 #include "chrome/browser/extensions/test_extension_system.h"

49 #include "chrome/browser/extensions/test_management_policy.h"	49 #include "chrome/browser/extensions/test_management_policy.h"

50 #include "chrome/browser/extensions/unpacked_installer.h"	50 #include "chrome/browser/extensions/unpacked_installer.h"

51 #include "chrome/browser/extensions/updater/extension_updater.h"	51 #include "chrome/browser/extensions/updater/extension_updater.h"

52 #include "chrome/browser/plugin_prefs_factory.h"	52 #include "chrome/browser/plugins/plugin_prefs_factory.h"

53 #include "chrome/browser/prefs/browser_prefs.h"	53 #include "chrome/browser/prefs/browser_prefs.h"

54 #include "chrome/browser/prefs/pref_service_mock_builder.h"	54 #include "chrome/browser/prefs/pref_service_mock_builder.h"

55 #include "chrome/browser/prefs/scoped_user_pref_update.h"	55 #include "chrome/browser/prefs/scoped_user_pref_update.h"

56 #include "chrome/common/chrome_constants.h"	56 #include "chrome/common/chrome_constants.h"

57 #include "chrome/common/chrome_notification_types.h"	57 #include "chrome/common/chrome_notification_types.h"

58 #include "chrome/common/chrome_paths.h"	58 #include "chrome/common/chrome_paths.h"

59 #include "chrome/common/chrome_switches.h"	59 #include "chrome/common/chrome_switches.h"

60 #include "chrome/common/extensions/extension.h"	60 #include "chrome/common/extensions/extension.h"

61 #include "chrome/common/extensions/extension_l10n_util.h"	61 #include "chrome/common/extensions/extension_l10n_util.h"

62 #include "chrome/common/extensions/extension_manifest_constants.h"	62 #include "chrome/common/extensions/extension_manifest_constants.h"

(...skipping 5469 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
5532 // This should NOT trigger an alert.	5532 // This should NOT trigger an alert.

5533 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0",	5533 provider->UpdateOrAddExtension(hosted_app, "1.0.0.0",

5534 data_dir_.AppendASCII("hosted_app.crx"));	5534 data_dir_.AppendASCII("hosted_app.crx"));

5535	5535

5536 service_->CheckForExternalUpdates();	5536 service_->CheckForExternalUpdates();

5537 loop_.RunAllPending();	5537 loop_.RunAllPending();

5538	5538

5539 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get()));	5539 ASSERT_TRUE(service_->PopulateExtensionErrorUI(extension_error_ui.get()));

5540 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size());	5540 ASSERT_EQ(1u, extension_error_ui->get_external_extension_ids()->size());

5541 }	5541 }

OLD	NEW