chrome/browser/extensions/all_urls_apitest.cc - Issue 24733003: Update defaults for InstantExtended.

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

Issue 24733003: Update defaults for InstantExtended. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix test exclusion. Created 7 years, 2 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/chrome_content_browser_client_browsertest.cc ('k') | chrome/browser/extensions/app_process_apitest.cc » ('j') | chrome/browser/extensions/lazy_background_page_apitest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/command_line.h"	5 #include "base/command_line.h"

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

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

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

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

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

(...skipping 36 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
47 // Then load extensions.	47 // Then load extensions.

48 ExtensionService* service = extensions::ExtensionSystem::Get(	48 ExtensionService* service = extensions::ExtensionSystem::Get(

49 browser()->profile())->extension_service();	49 browser()->profile())->extension_service();

50 const size_t size_before = service->extensions()->size();	50 const size_t size_before = service->extensions()->size();

51 ASSERT_TRUE(LoadExtension(extension_dir1));	51 ASSERT_TRUE(LoadExtension(extension_dir1));

52 ASSERT_TRUE(LoadExtension(extension_dir2));	52 ASSERT_TRUE(LoadExtension(extension_dir2));

53 EXPECT_EQ(size_before + 2, service->extensions()->size());	53 EXPECT_EQ(size_before + 2, service->extensions()->size());

54	54

55 std::string url;	55 std::string url;

56	56

57 // Now verify we run content scripts on chrome://newtab/.	57 // Now verify we run content scripts on chrome://omnibox/.

58 url = "chrome://newtab/";	58 url = "chrome://omnibox/";

59 ExtensionTestMessageListener listener1a("content script: " + url, false);	59 ExtensionTestMessageListener listener1a("content script: " + url, false);

60 ExtensionTestMessageListener listener1b("execute: " + url, false);	60 ExtensionTestMessageListener listener1b("execute: " + url, false);

61 ui_test_utils::NavigateToURL(browser(), GURL(url));	61 ui_test_utils::NavigateToURL(browser(), GURL(url));

62 ASSERT_TRUE(listener1a.WaitUntilSatisfied());	62 ASSERT_TRUE(listener1a.WaitUntilSatisfied());

63 ASSERT_TRUE(listener1b.WaitUntilSatisfied());	63 ASSERT_TRUE(listener1b.WaitUntilSatisfied());

64	64

65 // Now verify data: urls.	65 // Now verify data: urls.

66 url = "data:text/html;charset=utf-8,<html>asdf</html>";	66 url = "data:text/html;charset=utf-8,<html>asdf</html>";

67 ExtensionTestMessageListener listener2a("content script: " + url, false);	67 ExtensionTestMessageListener listener2a("content script: " + url, false);

68 ExtensionTestMessageListener listener2b("execute: " + url, false);	68 ExtensionTestMessageListener listener2b("execute: " + url, false);

(...skipping 47 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
116 // Now verify we can script a regular http page.	116 // Now verify we can script a regular http page.

117 ASSERT_TRUE(test_server()->Start());	117 ASSERT_TRUE(test_server()->Start());

118 GURL page_url = test_server()->GetURL(kAllUrlsTarget);	118 GURL page_url = test_server()->GetURL(kAllUrlsTarget);

119 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(),	119 ExtensionTestMessageListener listener1a("content script: " + page_url.spec(),

120 false);	120 false);

121 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false);	121 ExtensionTestMessageListener listener1b("execute: " + page_url.spec(), false);

122 ui_test_utils::NavigateToURL(browser(), page_url);	122 ui_test_utils::NavigateToURL(browser(), page_url);

123 ASSERT_TRUE(listener1a.WaitUntilSatisfied());	123 ASSERT_TRUE(listener1a.WaitUntilSatisfied());

124 ASSERT_TRUE(listener1b.WaitUntilSatisfied());	124 ASSERT_TRUE(listener1b.WaitUntilSatisfied());

125 }	125 }

OLD	NEW