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/file_path.h" | 5 #include "base/file_path.h" |
6 #include "base/logging.h" | 6 #include "base/logging.h" |
7 #include "base/memory/ref_counted.h" | 7 #include "base/memory/ref_counted.h" |
8 #include "base/memory/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
9 #include "base/values.h" | 9 #include "base/values.h" |
10 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
(...skipping 22 matching lines...) Expand all Loading... |
33 manifest.SetString("app.launch.web_url", launch_url); | 33 manifest.SetString("app.launch.web_url", launch_url); |
34 | 34 |
35 if (!extent.empty()) { | 35 if (!extent.empty()) { |
36 ListValue* urls = new ListValue(); | 36 ListValue* urls = new ListValue(); |
37 manifest.Set("app.urls", urls); | 37 manifest.Set("app.urls", urls); |
38 urls->Append(Value::CreateStringValue(extent)); | 38 urls->Append(Value::CreateStringValue(extent)); |
39 } | 39 } |
40 | 40 |
41 std::string error; | 41 std::string error; |
42 scoped_refptr<Extension> extension( | 42 scoped_refptr<Extension> extension( |
43 Extension::Create(path, Extension::INTERNAL, manifest, | 43 Extension::Create(path, extensions::Manifest::INTERNAL, manifest, |
44 Extension::NO_FLAGS, &error)); | 44 Extension::NO_FLAGS, &error)); |
45 EXPECT_TRUE(extension.get()) << error; | 45 EXPECT_TRUE(extension.get()) << error; |
46 return extension; | 46 return extension; |
47 } | 47 } |
48 | 48 |
49 } // namespace | 49 } // namespace |
50 | 50 |
51 TEST(ExtensionSetTest, ExtensionSet) { | 51 TEST(ExtensionSetTest, ExtensionSet) { |
52 scoped_refptr<Extension> ext1(CreateTestExtension( | 52 scoped_refptr<Extension> ext1(CreateTestExtension( |
53 "a", "https://chrome.google.com/launch", "https://chrome.google.com/")); | 53 "a", "https://chrome.google.com/launch", "https://chrome.google.com/")); |
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
127 to_add->Insert(ext5); | 127 to_add->Insert(ext5); |
128 to_add->Insert(ext6); | 128 to_add->Insert(ext6); |
129 | 129 |
130 ASSERT_TRUE(extensions.Contains(ext3->id())); | 130 ASSERT_TRUE(extensions.Contains(ext3->id())); |
131 ASSERT_TRUE(extensions.InsertAll(*to_add)); | 131 ASSERT_TRUE(extensions.InsertAll(*to_add)); |
132 EXPECT_EQ(4u, extensions.size()); | 132 EXPECT_EQ(4u, extensions.size()); |
133 | 133 |
134 ASSERT_FALSE(extensions.InsertAll(*to_add)); // Re-adding same set no-ops. | 134 ASSERT_FALSE(extensions.InsertAll(*to_add)); // Re-adding same set no-ops. |
135 EXPECT_EQ(4u, extensions.size()); | 135 EXPECT_EQ(4u, extensions.size()); |
136 } | 136 } |
OLD | NEW |