| 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_path.h" | 7 #include "base/file_path.h" |
| 8 #include "base/file_util.h" | 8 #include "base/file_util.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" | 12 #include "chrome/browser/extensions/extension_system.h" |
| 13 #include "chrome/browser/extensions/pending_extension_info.h" | 13 #include "chrome/browser/extensions/pending_extension_info.h" |
| 14 #include "chrome/browser/extensions/pending_extension_manager.h" | 14 #include "chrome/browser/extensions/pending_extension_manager.h" |
| 15 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
| 16 #include "chrome/common/extensions/extension.h" | 16 #include "chrome/common/extensions/extension.h" |
| 17 #include "chrome/common/extensions/extension_manifest_constants.h" | 17 #include "chrome/common/extensions/extension_manifest_constants.h" |
| 18 #include "chrome/common/string_ordinal.h" | 18 #include "chrome/common/string_ordinal.h" |
| 19 #include "chrome/browser/sync/test/integration/sync_test.h" | 19 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 20 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 20 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
| 21 #include "testing/gtest/include/gtest/gtest.h" | 21 #include "testing/gtest/include/gtest/gtest.h" |
| 22 | 22 |
| 23 using extensions::Extension; |
| 24 |
| 23 SyncExtensionHelper::ExtensionState::ExtensionState() | 25 SyncExtensionHelper::ExtensionState::ExtensionState() |
| 24 : enabled_state(ENABLED), incognito_enabled(false) {} | 26 : enabled_state(ENABLED), incognito_enabled(false) {} |
| 25 | 27 |
| 26 SyncExtensionHelper::ExtensionState::~ExtensionState() {} | 28 SyncExtensionHelper::ExtensionState::~ExtensionState() {} |
| 27 | 29 |
| 28 bool SyncExtensionHelper::ExtensionState::Equals( | 30 bool SyncExtensionHelper::ExtensionState::Equals( |
| 29 const SyncExtensionHelper::ExtensionState &other) const { | 31 const SyncExtensionHelper::ExtensionState &other) const { |
| 30 return ((enabled_state == other.enabled_state) && | 32 return ((enabled_state == other.enabled_state) && |
| 31 (incognito_enabled == other.incognito_enabled)); | 33 (incognito_enabled == other.incognito_enabled)); |
| 32 } | 34 } |
| (...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 345 if (extension->id() != expected_id) { | 347 if (extension->id() != expected_id) { |
| 346 EXPECT_EQ(expected_id, extension->id()); | 348 EXPECT_EQ(expected_id, extension->id()); |
| 347 return NULL; | 349 return NULL; |
| 348 } | 350 } |
| 349 DVLOG(2) << "created extension with name = " | 351 DVLOG(2) << "created extension with name = " |
| 350 << name << ", id = " << expected_id; | 352 << name << ", id = " << expected_id; |
| 351 (it->second)[name] = extension; | 353 (it->second)[name] = extension; |
| 352 id_to_name_[expected_id] = name; | 354 id_to_name_[expected_id] = name; |
| 353 return extension; | 355 return extension; |
| 354 } | 356 } |
| OLD | NEW |