From 937f9423702f57ab59c7dc5909bd3d2aa7917e24 Mon Sep 17 00:00:00 2001 From: tfarina Date: Tue, 14 Jul 2015 17:48:28 -0700 Subject: [PATCH] Move UpdateManifest test from unit_tests into extensions_unittests. This test does not have any dependency on chrome/ anymore. BUG=None TEST=extensions_unittests --gtest_filter=ExtensionUpdateManifestTest.* R=rdevlin.cronin@chromium.org TBR=thestig@chromium.org # for chrome Review URL: https://codereview.chromium.org/1234013002 Cr-Commit-Position: refs/heads/master@{#338788} --- chrome/chrome_common.gypi | 1 - chrome/chrome_tests_unit.gypi | 1 - chrome/common/BUILD.gn | 1 - chrome/common/extensions/DEPS | 1 - extensions/BUILD.gn | 1 + .../common}/update_manifest_unittest.cc | 2 +- extensions/extensions_tests.gyp | 1 + extensions/extensions_tests.gypi | 1 + 8 files changed, 4 insertions(+), 5 deletions(-) rename {chrome/common/extensions => extensions/common}/update_manifest_unittest.cc (99%) diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi index 38635cb344897d..49cfebaa8c538e 100644 --- a/chrome/chrome_common.gypi +++ b/chrome/chrome_common.gypi @@ -351,7 +351,6 @@ '<(DEPTH)/skia/skia.gyp:skia_library', '<(DEPTH)/third_party/icu/icu.gyp:icui18n', '<(DEPTH)/third_party/icu/icu.gyp:icuuc', - '<(DEPTH)/third_party/libxml/libxml.gyp:libxml', '<(DEPTH)/third_party/zlib/google/zip.gyp:zip', '<(DEPTH)/ui/gfx/ipc/gfx_ipc.gyp:gfx_ipc', '<(DEPTH)/ui/resources/ui_resources.gyp:ui_resources', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 1a668ef6c81089..ec18baa6292aae 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -906,7 +906,6 @@ 'common/extensions/permissions/permissions_data_unittest.cc', 'common/extensions/permissions/settings_override_permission_unittest.cc', 'common/extensions/sync_type_unittest.cc', - 'common/extensions/update_manifest_unittest.cc', 'common/extensions/value_counter_unittest.cc', 'renderer/extensions/extension_localization_peer_unittest.cc', 'renderer/extensions/renderer_permissions_policy_delegate_unittest.cc', diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn index e56b963d1b7587..eb0ce427f3e0d9 100644 --- a/chrome/common/BUILD.gn +++ b/chrome/common/BUILD.gn @@ -75,7 +75,6 @@ static_library("common") { "//net", "//skia", "//third_party/icu", - "//third_party/libxml", "//third_party/zlib:zip", "//ui/resources:resources", "//url", diff --git a/chrome/common/extensions/DEPS b/chrome/common/extensions/DEPS index a13d2556b04711..505f8e9d40f435 100644 --- a/chrome/common/extensions/DEPS +++ b/chrome/common/extensions/DEPS @@ -3,7 +3,6 @@ include_rules = [ "+device/usb", # For UsbDevicePermission "+extensions/grit", "+extensions/strings/grit", - "+libxml", "+ppapi/c", # For various types. "+skia", ] diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index 949fbe176bac15..bfc3f18db2bd3f 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -171,6 +171,7 @@ test("extensions_unittests") { "//testing/gmock", "//testing/gtest", "//third_party/leveldatabase", + "//third_party/libxml", "//third_party/mojo/src/mojo/edk/js", "//third_party/mojo/src/mojo/edk/system", "//third_party/mojo/src/mojo/public/cpp/bindings", diff --git a/chrome/common/extensions/update_manifest_unittest.cc b/extensions/common/update_manifest_unittest.cc similarity index 99% rename from chrome/common/extensions/update_manifest_unittest.cc rename to extensions/common/update_manifest_unittest.cc index 8915ab75397200..9a17505f3e4c26 100644 --- a/chrome/common/extensions/update_manifest_unittest.cc +++ b/extensions/common/update_manifest_unittest.cc @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "base/memory/scoped_vector.h" #include "extensions/common/update_manifest.h" + #include "libxml/globals.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/extensions/extensions_tests.gyp b/extensions/extensions_tests.gyp index 8703f29a374741..6e083ed6e8cc0e 100644 --- a/extensions/extensions_tests.gyp +++ b/extensions/extensions_tests.gyp @@ -28,6 +28,7 @@ '../testing/gmock.gyp:gmock', '../testing/gtest.gyp:gtest', '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase', + '../third_party/libxml/libxml.gyp:libxml', '../third_party/mojo/mojo_edk.gyp:mojo_js_lib', '../third_party/mojo/mojo_edk.gyp:mojo_system_impl', '../third_party/mojo/mojo_public.gyp:mojo_cpp_bindings', diff --git a/extensions/extensions_tests.gypi b/extensions/extensions_tests.gypi index 3f52b715ae59f5..c8b422b01c8595 100644 --- a/extensions/extensions_tests.gypi +++ b/extensions/extensions_tests.gypi @@ -135,6 +135,7 @@ 'common/url_pattern_set_unittest.cc', 'common/url_pattern_unittest.cc', 'common/user_script_unittest.cc', + 'common/update_manifest_unittest.cc', 'renderer/activity_log_converter_strategy_unittest.cc', 'renderer/api/mojo_private/mojo_private_unittest.cc', 'renderer/api/serial/data_receiver_unittest.cc',