| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/glue/extension_util.h" | 5 #include "chrome/browser/sync/glue/extension_util.h" |
| 6 | 6 |
| 7 #include "base/file_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/values.h" | 8 #include "base/values.h" |
| 9 #include "base/version.h" | |
| 10 #include "chrome/browser/sync/protocol/extension_specifics.pb.h" | 9 #include "chrome/browser/sync/protocol/extension_specifics.pb.h" |
| 11 #include "chrome/common/extensions/extension.h" | 10 #include "chrome/common/extensions/extension.h" |
| 12 #include "chrome/common/extensions/extension_constants.h" | 11 #include "chrome/common/extensions/extension_constants.h" |
| 13 #include "testing/gtest/include/gtest/gtest.h" | 12 #include "testing/gtest/include/gtest/gtest.h" |
| 14 | 13 |
| 15 namespace browser_sync { | 14 namespace browser_sync { |
| 16 | 15 |
| 17 namespace { | 16 namespace { |
| 18 | 17 |
| 19 #if defined(OS_WIN) | 18 #if defined(OS_WIN) |
| (...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 467 { | 466 { |
| 468 sync_pb::ExtensionSpecifics result = merged_specifics; | 467 sync_pb::ExtensionSpecifics result = merged_specifics; |
| 469 MergeExtensionSpecifics(specifics, true, &result); | 468 MergeExtensionSpecifics(specifics, true, &result); |
| 470 EXPECT_TRUE(AreExtensionSpecificsEqual(result, specifics)); | 469 EXPECT_TRUE(AreExtensionSpecificsEqual(result, specifics)); |
| 471 } | 470 } |
| 472 } | 471 } |
| 473 | 472 |
| 474 } // namespace | 473 } // namespace |
| 475 | 474 |
| 476 } // namespace browser_sync | 475 } // namespace browser_sync |
| OLD | NEW |