chrome/browser/extensions/content_script_apitest.cc - Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher.

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

Issue 555633003: Use extensions::ResultCatcher; delete ExtensionApiTest::ResultCatcher. (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master

Patch Set: Created 6 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/web_request/web_request_apitest.cc ('k') | chrome/browser/extensions/extension_apitest.h » ('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 "base/strings/stringprintf.h"	5 #include "base/strings/stringprintf.h"

6 #include "base/strings/utf_string_conversions.h"	6 #include "base/strings/utf_string_conversions.h"

7 #include "chrome/browser/extensions/api/permissions/permissions_api.h"	7 #include "chrome/browser/extensions/api/permissions/permissions_api.h"

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

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

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

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

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

13 #include "chrome/test/base/ui_test_utils.h"	13 #include "chrome/test/base/ui_test_utils.h"

14 #include "content/public/browser/web_contents.h"	14 #include "content/public/browser/web_contents.h"

15 #include "content/public/test/browser_test_utils.h"	15 #include "content/public/test/browser_test_utils.h"

16 #include "extensions/browser/notification_types.h"	16 #include "extensions/browser/notification_types.h"

17 #include "extensions/common/extension.h"	17 #include "extensions/common/extension.h"

	18 #include "extensions/test/result_catcher.h"

18 #include "net/dns/mock_host_resolver.h"	19 #include "net/dns/mock_host_resolver.h"

19 #include "net/test/embedded_test_server/embedded_test_server.h"	20 #include "net/test/embedded_test_server/embedded_test_server.h"

20 #include "url/gurl.h"	21 #include "url/gurl.h"

21	22

22 namespace extensions {	23 namespace extensions {

23	24

24 namespace {	25 namespace {

25	26

26 // A fake webstore domain.	27 // A fake webstore domain.

27 const char kWebstoreDomain[] = "cws.com";	28 const char kWebstoreDomain[] = "cws.com";

(...skipping 251 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
279 ASSERT_TRUE(StartEmbeddedTestServer());	280 ASSERT_TRUE(StartEmbeddedTestServer());

280 ASSERT_TRUE(RunExtensionTest("content_scripts/permissions")) << message_;	281 ASSERT_TRUE(RunExtensionTest("content_scripts/permissions")) << message_;

281 }	282 }

282	283

283 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBypassPageCSP) {	284 IN_PROC_BROWSER_TEST_F(ExtensionApiTest, ContentScriptBypassPageCSP) {

284 ASSERT_TRUE(StartEmbeddedTestServer());	285 ASSERT_TRUE(StartEmbeddedTestServer());

285 ASSERT_TRUE(RunExtensionTest("content_scripts/bypass_page_csp")) << message_;	286 ASSERT_TRUE(RunExtensionTest("content_scripts/bypass_page_csp")) << message_;

286 }	287 }

287	288

288 } // namespace extensions	289 } // namespace extensions

OLD	NEW