| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/pending_extension_info.h" | 12 #include "chrome/browser/extensions/pending_extension_info.h" |
| 13 #include "chrome/browser/extensions/pending_extension_manager.h" | 13 #include "chrome/browser/extensions/pending_extension_manager.h" |
| 14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
| 15 #include "chrome/common/extensions/extension_constants.h" | 15 #include "chrome/common/extensions/extension_constants.h" |
| 16 #include "chrome/common/string_ordinal.h" |
| 16 #include "chrome/browser/sync/test/integration/sync_test.h" | 17 #include "chrome/browser/sync/test/integration/sync_test.h" |
| 17 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" | 18 #include "chrome/browser/sync/test/integration/sync_datatype_helper.h" |
| 18 #include "testing/gtest/include/gtest/gtest.h" | 19 #include "testing/gtest/include/gtest/gtest.h" |
| 19 | 20 |
| 20 SyncExtensionHelper::ExtensionState::ExtensionState() | 21 SyncExtensionHelper::ExtensionState::ExtensionState() |
| 21 : enabled_state(ENABLED), incognito_enabled(false) {} | 22 : enabled_state(ENABLED), incognito_enabled(false) {} |
| 22 | 23 |
| 23 SyncExtensionHelper::ExtensionState::~ExtensionState() {} | 24 SyncExtensionHelper::ExtensionState::~ExtensionState() {} |
| 24 | 25 |
| 25 bool SyncExtensionHelper::ExtensionState::Equals( | 26 bool SyncExtensionHelper::ExtensionState::Equals( |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 | 58 |
| 58 setup_completed_ = true; | 59 setup_completed_ = true; |
| 59 } | 60 } |
| 60 | 61 |
| 61 void SyncExtensionHelper::InstallExtension( | 62 void SyncExtensionHelper::InstallExtension( |
| 62 Profile* profile, const std::string& name, Extension::Type type) { | 63 Profile* profile, const std::string& name, Extension::Type type) { |
| 63 scoped_refptr<Extension> extension = GetExtension(profile, name, type); | 64 scoped_refptr<Extension> extension = GetExtension(profile, name, type); |
| 64 ASSERT_TRUE(extension.get()) << "Could not get extension " << name | 65 ASSERT_TRUE(extension.get()) << "Could not get extension " << name |
| 65 << " (profile = " << profile << ")"; | 66 << " (profile = " << profile << ")"; |
| 66 profile->GetExtensionService()->OnExtensionInstalled( | 67 profile->GetExtensionService()->OnExtensionInstalled( |
| 67 extension, extension->UpdatesFromGallery(), 0); | 68 extension, extension->UpdatesFromGallery(), StringOrdinal()); |
| 68 } | 69 } |
| 69 | 70 |
| 70 void SyncExtensionHelper::UninstallExtension( | 71 void SyncExtensionHelper::UninstallExtension( |
| 71 Profile* profile, const std::string& name) { | 72 Profile* profile, const std::string& name) { |
| 72 ExtensionService::UninstallExtensionHelper(profile->GetExtensionService(), | 73 ExtensionService::UninstallExtensionHelper(profile->GetExtensionService(), |
| 73 NameToId(name)); | 74 NameToId(name)); |
| 74 } | 75 } |
| 75 | 76 |
| 76 std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames( | 77 std::vector<std::string> SyncExtensionHelper::GetInstalledExtensionNames( |
| 77 Profile* profile) const { | 78 Profile* profile) const { |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 352 if (extension->id() != expected_id) { | 353 if (extension->id() != expected_id) { |
| 353 EXPECT_EQ(expected_id, extension->id()); | 354 EXPECT_EQ(expected_id, extension->id()); |
| 354 return NULL; | 355 return NULL; |
| 355 } | 356 } |
| 356 VLOG(2) << "created extension with name = " | 357 VLOG(2) << "created extension with name = " |
| 357 << name << ", id = " << expected_id; | 358 << name << ", id = " << expected_id; |
| 358 (it->second)[name] = extension; | 359 (it->second)[name] = extension; |
| 359 id_to_name_[expected_id] = name; | 360 id_to_name_[expected_id] = name; |
| 360 return extension; | 361 return extension; |
| 361 } | 362 } |
| OLD | NEW |