chrome/browser/extensions/external_provider_impl_unittest.cc - Issue 318863008: Move ExtensionServiceTestBase into it's own header/cc file

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

Issue 318863008: Move ExtensionServiceTestBase into it's own header/cc file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix merge conflict Created 6 years, 6 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/external_provider_impl_chromeos_unittest.cc ('k') | chrome/browser/extensions/permissions_updater_unittest.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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 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/external_provider_impl.h"	5 #include "chrome/browser/extensions/external_provider_impl.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

8 #include "base/file_util.h"	8 #include "base/file_util.h"

9 #include "base/files/file_path.h"	9 #include "base/files/file_path.h"

10 #include "base/memory/scoped_ptr.h"	10 #include "base/memory/scoped_ptr.h"

11 #include "base/path_service.h"	11 #include "base/path_service.h"

12 #include "base/prefs/testing_pref_service.h"	12 #include "base/prefs/testing_pref_service.h"

13 #include "base/strings/stringprintf.h"	13 #include "base/strings/stringprintf.h"

14 #include "base/test/scoped_path_override.h"	14 #include "base/test/scoped_path_override.h"

15 #include "chrome/browser/chrome_notification_types.h"	15 #include "chrome/browser/chrome_notification_types.h"

16 #include "chrome/browser/extensions/extension_service_unittest.h"	16 #include "chrome/browser/extensions/extension_service.h"

	17 #include "chrome/browser/extensions/extension_service_test_base.h"

17 #include "chrome/browser/extensions/updater/extension_cache_fake.h"	18 #include "chrome/browser/extensions/updater/extension_cache_fake.h"

18 #include "chrome/common/chrome_paths.h"	19 #include "chrome/common/chrome_paths.h"

19 #include "chrome/common/chrome_switches.h"	20 #include "chrome/common/chrome_switches.h"

20 #include "chrome/common/extensions/extension_constants.h"	21 #include "chrome/common/extensions/extension_constants.h"

21 #include "chrome/test/base/testing_browser_process.h"	22 #include "chrome/test/base/testing_browser_process.h"

22 #include "chrome/test/base/testing_profile.h"	23 #include "chrome/test/base/testing_profile.h"

23 #include "content/public/browser/notification_service.h"	24 #include "content/public/browser/notification_service.h"

24 #include "content/public/test/test_utils.h"	25 #include "content/public/test/test_utils.h"

25 #include "net/test/embedded_test_server/embedded_test_server.h"	26 #include "net/test/embedded_test_server/embedded_test_server.h"

26 #include "net/test/embedded_test_server/http_request.h"	27 #include "net/test/embedded_test_server/http_request.h"

(...skipping 137 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
164 service_->CheckForExternalUpdates();	165 service_->CheckForExternalUpdates();

165 runner->Run();	166 runner->Run();

166	167

167 EXPECT_TRUE(service_->GetInstalledExtension(	168 EXPECT_TRUE(service_->GetInstalledExtension(

168 extension_misc::kInAppPaymentsSupportAppId));	169 extension_misc::kInAppPaymentsSupportAppId));

169 EXPECT_TRUE(service_->IsExtensionEnabled(	170 EXPECT_TRUE(service_->IsExtensionEnabled(

170 extension_misc::kInAppPaymentsSupportAppId));	171 extension_misc::kInAppPaymentsSupportAppId));

171 }	172 }

172	173

173 } // namespace extensions	174 } // namespace extensions

OLD	NEW