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 "chrome/browser/sync/test/integration/sync_extension_helper.h" | 5 #include "chrome/browser/sync/test/integration/sync_extension_helper.h" |
6 | 6 |
7 #include "base/file_util.h" | 7 #include "base/file_util.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
11 #include "chrome/browser/extensions/extension_service.h" | 11 #include "chrome/browser/extensions/extension_service.h" |
12 #include "chrome/browser/extensions/extension_system.h" | |
13 #include "chrome/browser/extensions/extension_util.h" | 12 #include "chrome/browser/extensions/extension_util.h" |
14 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 14 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
16 #include "chrome/browser/sync/test/integration/sync_test.h" | 15 #include "chrome/browser/sync/test/integration/sync_test.h" |
17 #include "extensions/browser/extension_registry.h" | 16 #include "extensions/browser/extension_registry.h" |
| 17 #include "extensions/browser/extension_system.h" |
18 #include "extensions/browser/pending_extension_info.h" | 18 #include "extensions/browser/pending_extension_info.h" |
19 #include "extensions/browser/pending_extension_manager.h" | 19 #include "extensions/browser/pending_extension_manager.h" |
20 #include "extensions/common/extension.h" | 20 #include "extensions/common/extension.h" |
21 #include "extensions/common/extension_set.h" | 21 #include "extensions/common/extension_set.h" |
22 #include "extensions/common/id_util.h" | 22 #include "extensions/common/id_util.h" |
23 #include "extensions/common/manifest_constants.h" | 23 #include "extensions/common/manifest_constants.h" |
24 #include "sync/api/string_ordinal.h" | 24 #include "sync/api/string_ordinal.h" |
25 #include "testing/gtest/include/gtest/gtest.h" | 25 #include "testing/gtest/include/gtest/gtest.h" |
26 | 26 |
27 using extensions::Extension; | 27 using extensions::Extension; |
(...skipping 346 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
374 EXPECT_EQ(expected_id, extension->id()); | 374 EXPECT_EQ(expected_id, extension->id()); |
375 return NULL; | 375 return NULL; |
376 } | 376 } |
377 DVLOG(2) << "created extension with name = " | 377 DVLOG(2) << "created extension with name = " |
378 << name << ", id = " << expected_id; | 378 << name << ", id = " << expected_id; |
379 (it->second)[name] = extension; | 379 (it->second)[name] = extension; |
380 id_to_name_[expected_id] = name; | 380 id_to_name_[expected_id] = name; |
381 id_to_type_[expected_id] = type; | 381 id_to_type_[expected_id] = type; |
382 return extension; | 382 return extension; |
383 } | 383 } |
OLD | NEW |