chrome/browser/extensions/crx_installer_browsertest.cc - Issue 20593003: Move kEnableExperimentalExtensionApis switch to extensions/common/switches.cc.

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

Issue 20593003: Move kEnableExperimentalExtensionApis switch to extensions/common/switches.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 7 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

« no previous file with comments | « chrome/browser/extensions/api/web_request/web_request_apitest.cc ('k') | chrome/browser/extensions/extension_get_views_apitest.cc » ('j') | no next file with comments »
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 "chrome/browser/download/download_crx_util.h"	5 #include "chrome/browser/download/download_crx_util.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_install_prompt.h"	8 #include "chrome/browser/extensions/extension_install_prompt.h"

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

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

11 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/ui/browser.h"	12 #include "chrome/browser/ui/browser.h"

13 #include "chrome/browser/ui/browser_window.h"	13 #include "chrome/browser/ui/browser_window.h"

14 #include "chrome/browser/ui/tabs/tab_strip_model.h"	14 #include "chrome/browser/ui/tabs/tab_strip_model.h"

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

16 #include "chrome/common/extensions/extension.h"	15 #include "chrome/common/extensions/extension.h"

17 #include "chrome/common/extensions/extension_file_util.h"	16 #include "chrome/common/extensions/extension_file_util.h"

18 #include "chrome/common/extensions/feature_switch.h"	17 #include "chrome/common/extensions/feature_switch.h"

19 #include "chrome/common/extensions/permissions/permission_set.h"	18 #include "chrome/common/extensions/permissions/permission_set.h"

20 #include "chrome/test/base/ui_test_utils.h"	19 #include "chrome/test/base/ui_test_utils.h"

21 #include "content/public/browser/download_manager.h"	20 #include "content/public/browser/download_manager.h"

22 #include "content/public/test/download_test_observer.h"	21 #include "content/public/test/download_test_observer.h"

	22 #include "extensions/common/switches.h"

23 #include "grit/generated_resources.h"	23 #include "grit/generated_resources.h"

24 #include "ui/base/l10n/l10n_util.h"	24 #include "ui/base/l10n/l10n_util.h"

25	25

26 class SkBitmap;	26 class SkBitmap;

27	27

28 namespace extensions {	28 namespace extensions {

29	29

30 namespace {	30 namespace {

31	31

32 // Observer waits for exactly one download to finish.	32 // Observer waits for exactly one download to finish.

(...skipping 340 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
373	373

374 // The version 2 delayed install should be cleaned up, and finishing	374 // The version 2 delayed install should be cleaned up, and finishing

375 // delayed extension installation shouldn't break anything.	375 // delayed extension installation shouldn't break anything.

376 ASSERT_EQ(0u, service->delayed_installs()->size());	376 ASSERT_EQ(0u, service->delayed_installs()->size());

377 service->MaybeFinishDelayedInstallations();	377 service->MaybeFinishDelayedInstallations();

378 extension = service->GetExtensionById(extension_id, false);	378 extension = service->GetExtensionById(extension_id, false);

379 ASSERT_EQ("3.0", extension->version()->GetString());	379 ASSERT_EQ("3.0", extension->version()->GetString());

380 }	380 }

381	381

382 } // namespace extensions	382 } // namespace extensions

OLD	NEW