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

Side by Side Diff: chrome/common/extensions/manifest_tests/extension_manifests_validapp_unittest.cc

Issue 1551503002: Convert Pass()→std::move() in //chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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 <utility>
6
5 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
6 #include "base/values.h" 8 #include "base/values.h"
7 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h" 9 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
8 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h" 10 #include "chrome/common/extensions/manifest_tests/chrome_manifest_test.h"
9 #include "testing/gtest/include/gtest/gtest.h" 11 #include "testing/gtest/include/gtest/gtest.h"
10 12
11 typedef ChromeManifestTest ValidAppManifestTest; 13 typedef ChromeManifestTest ValidAppManifestTest;
12 14
13 TEST_F(ValidAppManifestTest, ValidApp) { 15 TEST_F(ValidAppManifestTest, ValidApp) {
14 scoped_refptr<extensions::Extension> extension( 16 scoped_refptr<extensions::Extension> extension(
15 LoadAndExpectSuccess("valid_app.json")); 17 LoadAndExpectSuccess("valid_app.json"));
16 extensions::URLPatternSet expected_patterns; 18 extensions::URLPatternSet expected_patterns;
17 AddPattern(&expected_patterns, "http://www.google.com/mail/*"); 19 AddPattern(&expected_patterns, "http://www.google.com/mail/*");
18 AddPattern(&expected_patterns, "http://www.google.com/foobar/*"); 20 AddPattern(&expected_patterns, "http://www.google.com/foobar/*");
19 EXPECT_EQ(expected_patterns, extension->web_extent()); 21 EXPECT_EQ(expected_patterns, extension->web_extent());
20 EXPECT_EQ(extensions::LAUNCH_CONTAINER_TAB, 22 EXPECT_EQ(extensions::LAUNCH_CONTAINER_TAB,
21 extensions::AppLaunchInfo::GetLaunchContainer(extension.get())); 23 extensions::AppLaunchInfo::GetLaunchContainer(extension.get()));
22 EXPECT_EQ(GURL("http://www.google.com/mail/"), 24 EXPECT_EQ(GURL("http://www.google.com/mail/"),
23 extensions::AppLaunchInfo::GetLaunchWebURL(extension.get())); 25 extensions::AppLaunchInfo::GetLaunchWebURL(extension.get()));
24 } 26 }
25 27
26 TEST_F(ValidAppManifestTest, AllowUnrecognizedPermissions) { 28 TEST_F(ValidAppManifestTest, AllowUnrecognizedPermissions) {
27 std::string error; 29 std::string error;
28 scoped_ptr<base::DictionaryValue> manifest( 30 scoped_ptr<base::DictionaryValue> manifest(
29 LoadManifest("valid_app.json", &error)); 31 LoadManifest("valid_app.json", &error));
30 base::ListValue* permissions = NULL; 32 base::ListValue* permissions = NULL;
31 ASSERT_TRUE(manifest->GetList("permissions", &permissions)); 33 ASSERT_TRUE(manifest->GetList("permissions", &permissions));
32 permissions->Append(new base::StringValue("not-a-valid-permission")); 34 permissions->Append(new base::StringValue("not-a-valid-permission"));
33 LoadAndExpectSuccess(ManifestData(manifest.Pass(), "")); 35 LoadAndExpectSuccess(ManifestData(std::move(manifest), ""));
34 } 36 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698