chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc - Issue 506883003: Remove implicit conversions from scoped_refptr to T* in chrome/*/extensions/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: chrome/common/extensions/manifest_handlers/content_scripts_manifest_unittest.cc

Issue 506883003: Remove implicit conversions from scoped_refptr to T* in chrome/*/extensions/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@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/common/extensions/extension_unittest.cc ('k') | chrome/common/extensions/manifest_handlers/settings_overrides_handler_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 (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 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 "base/command_line.h"	5 #include "base/command_line.h"

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

7 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"	7 #include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"

8 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"	8 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"

9 #include "extensions/common/error_utils.h"	9 #include "extensions/common/error_utils.h"

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

(...skipping 55 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
66	66

67 EXPECT_EQ(expected, scriptable_hosts);	67 EXPECT_EQ(expected, scriptable_hosts);

68 }	68 }

69	69

70 TEST_F(ContentScriptsManifestTest, ContentScriptIds) {	70 TEST_F(ContentScriptsManifestTest, ContentScriptIds) {

71 scoped_refptr<Extension> extension1 =	71 scoped_refptr<Extension> extension1 =

72 LoadAndExpectSuccess("content_script_yahoo.json");	72 LoadAndExpectSuccess("content_script_yahoo.json");

73 scoped_refptr<Extension> extension2 =	73 scoped_refptr<Extension> extension2 =

74 LoadAndExpectSuccess("content_script_yahoo.json");	74 LoadAndExpectSuccess("content_script_yahoo.json");

75 const UserScriptList& user_scripts1 =	75 const UserScriptList& user_scripts1 =

76 ContentScriptsInfo::GetContentScripts(extension1);	76 ContentScriptsInfo::GetContentScripts(extension1.get());

77 ASSERT_EQ(1u, user_scripts1.size());	77 ASSERT_EQ(1u, user_scripts1.size());

78 int id = user_scripts1[0].id();	78 int id = user_scripts1[0].id();

79 const UserScriptList& user_scripts2 =	79 const UserScriptList& user_scripts2 =

80 ContentScriptsInfo::GetContentScripts(extension2);	80 ContentScriptsInfo::GetContentScripts(extension2.get());

81 ASSERT_EQ(1u, user_scripts2.size());	81 ASSERT_EQ(1u, user_scripts2.size());

82 // The id of the content script should be one higher than the previous.	82 // The id of the content script should be one higher than the previous.

83 EXPECT_EQ(id + 1, user_scripts2[0].id());	83 EXPECT_EQ(id + 1, user_scripts2[0].id());

84 }	84 }

85	85

86 } // namespace extensions	86 } // namespace extensions

OLD	NEW