Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(43)

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_chromepermission_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
OLDNEW
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/command_line.h" 5 #include "base/command_line.h"
6 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h" 6 #include "chrome/common/extensions/manifest_tests/extension_manifest_test.h"
7 #include "chrome/common/url_constants.h" 7 #include "chrome/common/url_constants.h"
8 #include "extensions/common/error_utils.h" 8 #include "extensions/common/error_utils.h"
9 #include "extensions/common/extension.h" 9 #include "extensions/common/extension.h"
10 #include "extensions/common/manifest.h" 10 #include "extensions/common/manifest.h"
(...skipping 17 matching lines...) Expand all
28 // Ignore the policy delegate for this test. 28 // Ignore the policy delegate for this test.
29 PermissionsData::SetPolicyDelegate(NULL); 29 PermissionsData::SetPolicyDelegate(NULL);
30 CommandLine::ForCurrentProcess()->AppendSwitch( 30 CommandLine::ForCurrentProcess()->AppendSwitch(
31 switches::kExtensionsOnChromeURLs); 31 switches::kExtensionsOnChromeURLs);
32 std::string error; 32 std::string error;
33 scoped_refptr<Extension> extension = 33 scoped_refptr<Extension> extension =
34 LoadAndExpectSuccess("permission_chrome_url_invalid.json"); 34 LoadAndExpectSuccess("permission_chrome_url_invalid.json");
35 EXPECT_EQ("", error); 35 EXPECT_EQ("", error);
36 const GURL newtab_url(chrome::kChromeUINewTabURL); 36 const GURL newtab_url(chrome::kChromeUINewTabURL);
37 EXPECT_TRUE(extension->permissions_data()->CanAccessPage( 37 EXPECT_TRUE(extension->permissions_data()->CanAccessPage(
38 extension, newtab_url, newtab_url, 0, -1, &error)) 38 extension.get(), newtab_url, newtab_url, 0, -1, &error))
39 << error; 39 << error;
40 } 40 }
41 41
42 TEST_F(ExtensionManifestTest, ChromeResourcesPermissionValidOnlyForComponents) { 42 TEST_F(ExtensionManifestTest, ChromeResourcesPermissionValidOnlyForComponents) {
43 LoadAndExpectWarning("permission_chrome_resources_url.json", 43 LoadAndExpectWarning("permission_chrome_resources_url.json",
44 ErrorUtils::FormatErrorMessage( 44 ErrorUtils::FormatErrorMessage(
45 errors::kInvalidPermissionScheme, 45 errors::kInvalidPermissionScheme,
46 "chrome://resources/")); 46 "chrome://resources/"));
47 std::string error; 47 std::string error;
48 LoadExtension(Manifest("permission_chrome_resources_url.json"), 48 LoadExtension(Manifest("permission_chrome_resources_url.json"),
49 &error, 49 &error,
50 extensions::Manifest::COMPONENT, 50 extensions::Manifest::COMPONENT,
51 Extension::NO_FLAGS); 51 Extension::NO_FLAGS);
52 EXPECT_EQ("", error); 52 EXPECT_EQ("", error);
53 } 53 }
54 54
55 } // namespace extensions 55 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698