| 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/files/file_path.h" | 5 #include "base/files/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" | |
| 11 #include "chrome/common/extensions/extension_set.h" | 10 #include "chrome/common/extensions/extension_set.h" |
| 11 #include "extensions/common/extension.h" |
| 12 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 13 | 13 |
| 14 using extensions::Extension; | 14 using extensions::Extension; |
| 15 | 15 |
| 16 namespace { | 16 namespace { |
| 17 | 17 |
| 18 scoped_refptr<Extension> CreateTestExtension(const std::string& name, | 18 scoped_refptr<Extension> CreateTestExtension(const std::string& name, |
| 19 const std::string& launch_url, | 19 const std::string& launch_url, |
| 20 const std::string& extent) { | 20 const std::string& extent) { |
| 21 #if defined(OS_WIN) | 21 #if defined(OS_WIN) |
| (...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 EXPECT_TRUE(to_add->Insert(ext5)); | 131 EXPECT_TRUE(to_add->Insert(ext5)); |
| 132 EXPECT_TRUE(to_add->Insert(ext6)); | 132 EXPECT_TRUE(to_add->Insert(ext6)); |
| 133 | 133 |
| 134 ASSERT_TRUE(extensions.Contains(ext3->id())); | 134 ASSERT_TRUE(extensions.Contains(ext3->id())); |
| 135 ASSERT_TRUE(extensions.InsertAll(*to_add)); | 135 ASSERT_TRUE(extensions.InsertAll(*to_add)); |
| 136 EXPECT_EQ(4u, extensions.size()); | 136 EXPECT_EQ(4u, extensions.size()); |
| 137 | 137 |
| 138 ASSERT_FALSE(extensions.InsertAll(*to_add)); // Re-adding same set no-ops. | 138 ASSERT_FALSE(extensions.InsertAll(*to_add)); // Re-adding same set no-ops. |
| 139 EXPECT_EQ(4u, extensions.size()); | 139 EXPECT_EQ(4u, extensions.size()); |
| 140 } | 140 } |
| OLD | NEW |