chrome/browser/extensions/extension_management_browsertest.cc - Issue 10382149: Refactor the various ways to control what users can do to extensions.

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

Issue 10382149: Refactor the various ways to control what users can do to extensions. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

« chrome/browser/extensions/extension_management_apitest.cc ('K') | « chrome/browser/extensions/extension_management_apitest.cc ('k') | chrome/browser/extensions/extension_prefs.h » ('j') | chrome/browser/extensions/extension_prefs.h » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "base/memory/ref_counted.h"	5 #include "base/memory/ref_counted.h"

6 #include "base/stl_util.h"	6 #include "base/stl_util.h"

7 #include "chrome/browser/extensions/autoupdate_interceptor.h"	7 #include "chrome/browser/extensions/autoupdate_interceptor.h"

8 #include "chrome/browser/extensions/extension_browsertest.h"	8 #include "chrome/browser/extensions/extension_browsertest.h"

9 #include "chrome/browser/extensions/extension_host.h"	9 #include "chrome/browser/extensions/extension_host.h"

10 #include "chrome/browser/extensions/extension_service.h"	10 #include "chrome/browser/extensions/extension_service.h"

	11 #include "chrome/browser/extensions/extension_system.h"
	Aaron Boodman 2012/05/22 15:56:11 Extra includes? Extra includes?
11 #include "chrome/browser/extensions/extension_test_message_listener.h"	12 #include "chrome/browser/extensions/extension_test_message_listener.h"

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

12 #include "chrome/browser/extensions/updater/extension_updater.h"	14 #include "chrome/browser/extensions/updater/extension_updater.h"

13 #include "chrome/browser/infobars/infobar_tab_helper.h"	15 #include "chrome/browser/infobars/infobar_tab_helper.h"

14 #include "chrome/browser/prefs/pref_service.h"	16 #include "chrome/browser/prefs/pref_service.h"

15 #include "chrome/browser/prefs/scoped_user_pref_update.h"	17 #include "chrome/browser/prefs/scoped_user_pref_update.h"

16 #include "chrome/browser/profiles/profile.h"	18 #include "chrome/browser/profiles/profile.h"

17 #include "chrome/browser/ui/browser.h"	19 #include "chrome/browser/ui/browser.h"

18 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"	20 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"

19 #include "chrome/common/chrome_notification_types.h"	21 #include "chrome/common/chrome_notification_types.h"

20 #include "chrome/common/pref_names.h"	22 #include "chrome/common/pref_names.h"

21 #include "chrome/common/url_constants.h"	23 #include "chrome/common/url_constants.h"

(...skipping 589 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
611 std::string(kExtensionId) + ";http://localhost/autoupdate/manifest"));	613 std::string(kExtensionId) + ";http://localhost/autoupdate/manifest"));

612 }	614 }

613 ASSERT_TRUE(WaitForExtensionInstall());	615 ASSERT_TRUE(WaitForExtensionInstall());

614 ASSERT_EQ(size_before + 1, service->extensions()->size());	616 ASSERT_EQ(size_before + 1, service->extensions()->size());

615 extension = service->GetExtensionById(kExtensionId, false);	617 extension = service->GetExtensionById(kExtensionId, false);

616 ASSERT_TRUE(extension);	618 ASSERT_TRUE(extension);

617 EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());	619 EXPECT_EQ(Extension::EXTERNAL_POLICY_DOWNLOAD, extension->location());

618 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));	620 EXPECT_TRUE(service->IsExtensionEnabled(kExtensionId));

619 EXPECT_TRUE(service->disabled_extensions()->is_empty());	621 EXPECT_TRUE(service->disabled_extensions()->is_empty());

620 }	622 }

OLD	NEW