diff options
| author | brettw <brettw@chromium.org> | 2015-07-10 17:20:51 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-07-11 00:21:39 +0000 |
| commit | 39355da5ab86e662d701fcba8fef4e20921b38f0 (patch) | |
| tree | 237011a4b86a64c44ebecb802bcccda7a931ccd5 | |
| parent | 117ee8b5ff7a2d37aaf2f2f05ca9338260ec8bb6 (diff) | |
| download | chromium_src-39355da5ab86e662d701fcba8fef4e20921b38f0.zip chromium_src-39355da5ab86e662d701fcba8fef4e20921b38f0.tar.gz chromium_src-39355da5ab86e662d701fcba8fef4e20921b38f0.tar.bz2 | |
Move GN obj files to target-specific dirs
Previously GN would put object files in a similar place to GYP. They would go in a corresponding directory as the source file and would be prefixed with the target name for uniqueness.
Since GN target names are not unique, this doesn't work as well. Instead use a simpler scheme and put all the object files in a directory for each target.
This causes a few object file name collisions which this patch fixes in various ways:
- Renamed chrome/browser/ui/views/find_bar_host_interactive_uitest.cc to have "views" in the name (collided with chrome/browser/ui/find_bar/find_bar_host_interactive_uitest.cc)
- Renamed chrome/browser/apps/speech_recognition_browsertest.cc to have "app" in the name (collided with chrome/browser/speech/speech_recognition_browsertest.cc).
- Renamed chrome/common/extensions/api/extension_api_unittest.cc to have "common" in the name (collided with chrome/browser/extensions/extension_api_unittest.cc which is actually a test harness with that name).
- Moved the extensions files that were in the chrome interactive UI tests and browser tests to source sets in the extensions directory. These are things that should be cleaned up and moved there anyway.
- Net has some messy duplication in quic files. I made a dummy target for them. Apparently each copy of this file (same code, different namespace) is supposed to match something different upstream and this should be fixed.
- Moved chrome/browser/chromeos unit tests to its own target.
- Renamed chrome/browser/favicon/favicon_helper to favicon_utils. It conflicted with chrome/browser/android/favicon_helper which has an actual class named "FaviconHelper.
- Renamed service.* and service_factory.* in chrome/browser/chromeos/launcher_search_provider to have a launcher_search_provider prefix to avoid collisions with the file_system_provider one.
- Added a "chromeos" prefix to chrome/browser/chromeos/first_run/first_run_browsertest.cc to avoid collisions with the one in browser/first_run.
- Added "chromeos" to chrome/browser/chromeos/preferences_browsertest.cc to avoid collision with browser/ui/webui/options.
- Rename "chrome/browser/chromeos/drive/test_util.*" to "drive_test_util.*". Update includes. Rename chrome/browser/chromeos/file_manager/drive_test_util* to mount_test_util to avoid colliding with above new file.
The deps->public_deps changes in components/policy and content/test is because those targets were used externally in a way that this patch uncovered.
Review URL: https://codereview.chromium.org/1208963003
Cr-Commit-Position: refs/heads/master@{#338408}
66 files changed, 445 insertions, 219 deletions
diff --git a/build/toolchain/gcc_toolchain.gni b/build/toolchain/gcc_toolchain.gni index ae9599a..31c505c 100644 --- a/build/toolchain/gcc_toolchain.gni +++ b/build/toolchain/gcc_toolchain.gni @@ -95,7 +95,7 @@ template("gcc_toolchain") { depsformat = "gcc" description = "CC {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } @@ -105,7 +105,7 @@ template("gcc_toolchain") { depsformat = "gcc" description = "CXX {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } @@ -116,7 +116,7 @@ template("gcc_toolchain") { depsformat = "gcc" description = "ASM {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } diff --git a/build/toolchain/mac/BUILD.gn b/build/toolchain/mac/BUILD.gn index da4ca05..d16bb23 100644 --- a/build/toolchain/mac/BUILD.gn +++ b/build/toolchain/mac/BUILD.gn @@ -54,7 +54,7 @@ template("mac_toolchain") { depsformat = "gcc" description = "CC {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } @@ -64,7 +64,7 @@ template("mac_toolchain") { depsformat = "gcc" description = "CXX {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } @@ -75,7 +75,7 @@ template("mac_toolchain") { depsformat = "gcc" description = "ASM {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } @@ -85,7 +85,7 @@ template("mac_toolchain") { depsformat = "gcc" description = "OBJC {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } @@ -95,7 +95,7 @@ template("mac_toolchain") { depsformat = "gcc" description = "OBJCXX {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.o", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.o", ] } diff --git a/build/toolchain/win/BUILD.gn b/build/toolchain/win/BUILD.gn index 0236c8e..454cdde 100644 --- a/build/toolchain/win/BUILD.gn +++ b/build/toolchain/win/BUILD.gn @@ -88,7 +88,7 @@ template("msvc_toolchain") { depsformat = "msvc" description = "CC {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.obj", ] rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_c}}" } @@ -105,7 +105,7 @@ template("msvc_toolchain") { depsformat = "msvc" description = "CXX {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.obj", ] rspfile_content = "{{defines}} {{include_dirs}} {{cflags}} {{cflags_cc}}" } @@ -113,7 +113,7 @@ template("msvc_toolchain") { tool("rc") { command = "$python_path gyp-win-tool rc-wrapper $env rc.exe {{defines}} {{include_dirs}} /fo{{output}} {{source}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.res", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.res", ] description = "RC {{output}}" } @@ -124,7 +124,7 @@ template("msvc_toolchain") { command = "$python_path gyp-win-tool asm-wrapper $env ml.exe {{defines}} {{include_dirs}} /safeseh /c /Fo {{output}} {{source}}" description = "ASM {{output}}" outputs = [ - "{{source_out_dir}}/{{target_output_name}}.{{source_name_part}}.obj", + "{{target_out_dir}}/{{target_output_name}}/{{source_name_part}}.obj", ] } diff --git a/chrome/browser/apps/speech_recognition_browsertest.cc b/chrome/browser/apps/app_speech_recognition_browsertest.cc index e413aa5..e413aa5 100644 --- a/chrome/browser/apps/speech_recognition_browsertest.cc +++ b/chrome/browser/apps/app_speech_recognition_browsertest.cc diff --git a/chrome/browser/chromeos/BUILD.gn b/chrome/browser/chromeos/BUILD.gn index 4abd9c4..a2ddbad 100644 --- a/chrome/browser/chromeos/BUILD.gn +++ b/chrome/browser/chromeos/BUILD.gn @@ -4,6 +4,7 @@ import("//build/config/features.gni") import("//build/config/ui.gni") +import("//chrome/chrome_tests.gni") import("//media/media_options.gni") import("//third_party/protobuf/proto_library.gni") @@ -28,6 +29,7 @@ source_set("chromeos") { "//chrome:extra_resources", "//chrome:resources", "//chrome:strings", + "//components/wallpaper", "//content/app/resources", "//ui/chromeos/resources", "//ui/chromeos/strings", @@ -37,12 +39,14 @@ source_set("chromeos") { deps = [ # TODO(tbarzic): Cleanup this list. + ":attestation_proto", + ":device_policy_proto", + ":drive_proto", "//ash", "//ash:ash_with_content", "//components/login", "//components/session_manager/core", "//components/user_manager", - "//components/wallpaper", "//components/wifi_sync", "//chrome/browser/devtools", "//chrome/browser/extensions", @@ -118,9 +122,6 @@ source_set("chromeos") { "//ui/web_dialogs", "//url", "//v8", - ":attestation_proto", - ":device_policy_proto", - ":drive_proto", ] defines = [] @@ -160,6 +161,36 @@ source_set("chromeos") { } } +source_set("unit_tests") { + testonly = true + + sources = rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_sources, + ".", + "//chrome") + + public_deps = [ + ":chromeos", + ] + deps = [ + ":attestation_proto", + ":device_policy_proto", + ":drive_proto", + "//ash/resources", + "//components/policy", + "//components/invalidation/public", + "//crypto:platform", + "//dbus", + "//skia", + "//sync", + "//testing/gmock", + "//testing/gtest", + "//third_party/leveldatabase", + "//third_party/mojo/src/mojo/public/cpp/system:system", + "//ui/chromeos/resources", + ] +} + proto_library("drive_proto") { sources = [ "drive/drive.proto", diff --git a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc index 0a82ac5..7edc3cf 100644 --- a/chrome/browser/chromeos/drive/change_list_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_loader_unittest.cc @@ -12,12 +12,12 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader_observer.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc index 42960ed..48231d7 100644 --- a/chrome/browser/chromeos/drive/change_list_processor_unittest.cc +++ b/chrome/browser/chromeos/drive/change_list_processor_unittest.cc @@ -9,12 +9,12 @@ #include "base/thread_task_runner_handle.h" #include "base/values.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/drive_api_parser.h" #include "google_apis/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/directory_loader_unittest.cc b/chrome/browser/chromeos/drive/directory_loader_unittest.cc index d431a71..91a015d 100644 --- a/chrome/browser/chromeos/drive/directory_loader_unittest.cc +++ b/chrome/browser/chromeos/drive/directory_loader_unittest.cc @@ -13,11 +13,11 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/change_list_loader_observer.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc index 2240714..c69d933 100644 --- a/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/drive_file_stream_reader_unittest.cc @@ -11,10 +11,10 @@ #include "base/files/scoped_temp_dir.h" #include "base/run_loop.h" #include "base/threading/thread.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/local_file_reader.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/drive/test_util.cc b/chrome/browser/chromeos/drive/drive_test_util.cc index 644fb84..ede6cdc 100644 --- a/chrome/browser/chromeos/drive/test_util.cc +++ b/chrome/browser/chromeos/drive/drive_test_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "base/prefs/pref_registry_simple.h" #include "base/prefs/testing_pref_service.h" diff --git a/chrome/browser/chromeos/drive/test_util.h b/chrome/browser/chromeos/drive/drive_test_util.h index 2e418a8..e7904cb 100644 --- a/chrome/browser/chromeos/drive/test_util.h +++ b/chrome/browser/chromeos/drive/drive_test_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_ -#define CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_ +#ifndef CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_ +#define CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_ #include <string> @@ -81,4 +81,4 @@ class FakeNetworkChangeNotifier : public net::NetworkChangeNotifier { } // namespace test_util } // namespace drive -#endif // CHROME_BROWSER_CHROMEOS_DRIVE_TEST_UTIL_H_ +#endif // CHROME_BROWSER_CHROMEOS_DRIVE_DRIVE_TEST_UTIL_H_ diff --git a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc index 7eaf030..17df38a 100644 --- a/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc +++ b/chrome/browser/chromeos/drive/fake_free_disk_space_getter.cc @@ -4,7 +4,7 @@ #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" namespace drive { diff --git a/chrome/browser/chromeos/drive/file_cache_unittest.cc b/chrome/browser/chromeos/drive/file_cache_unittest.cc index e7ef041..a5ae9cf 100644 --- a/chrome/browser/chromeos/drive/file_cache_unittest.cc +++ b/chrome/browser/chromeos/drive/file_cache_unittest.cc @@ -16,10 +16,10 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/resource_metadata_storage.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system/operation_test_base.h b/chrome/browser/chromeos/drive/file_system/operation_test_base.h index a368f23..b65257e 100644 --- a/chrome/browser/chromeos/drive/file_system/operation_test_base.h +++ b/chrome/browser/chromeos/drive/file_system/operation_test_base.h @@ -9,10 +9,10 @@ #include "base/files/scoped_temp_dir.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_errors.h" #include "chrome/browser/chromeos/drive/file_system/operation_delegate.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/file_system_unittest.cc b/chrome/browser/chromeos/drive/file_system_unittest.cc index 05a8090..c9ff562 100644 --- a/chrome/browser/chromeos/drive/file_system_unittest.cc +++ b/chrome/browser/chromeos/drive/file_system_unittest.cc @@ -18,13 +18,13 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/file_system_observer.h" #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/sync_client.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/drive_api_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" diff --git a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc index 245e8f7..3727b22 100644 --- a/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc +++ b/chrome/browser/chromeos/drive/fileapi/webkit_file_stream_reader_impl_unittest.cc @@ -12,10 +12,10 @@ #include "base/run_loop.h" #include "base/threading/thread.h" #include "base/time/time.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc index 9a775c0..e36636d 100644 --- a/chrome/browser/chromeos/drive/job_scheduler_unittest.cc +++ b/chrome/browser/chromeos/drive/job_scheduler_unittest.cc @@ -16,7 +16,7 @@ #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive_pref_names.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" diff --git a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc index 3636d55..8a429e1 100644 --- a/chrome/browser/chromeos/drive/local_file_reader_unittest.cc +++ b/chrome/browser/chromeos/drive/local_file_reader_unittest.cc @@ -13,7 +13,7 @@ #include "base/message_loop/message_loop.h" #include "base/rand_util.h" #include "base/threading/thread.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "google_apis/drive/test_util.h" #include "net/base/io_buffer.h" #include "net/base/test_completion_callback.h" diff --git a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc index 3c72223..415a53b 100644 --- a/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc +++ b/chrome/browser/chromeos/drive/remove_stale_cache_files_unittest.cc @@ -11,11 +11,11 @@ #include "base/single_thread_task_runner.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" #include "chrome/browser/chromeos/drive/remove_stale_cache_files.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "google_apis/drive/test_util.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc index 3fc656d..fecc616 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_storage_unittest.cc @@ -12,7 +12,7 @@ #include "base/strings/string_split.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" -#include "chrome/browser/chromeos/drive/test_util.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/leveldatabase/src/include/leveldb/db.h" diff --git a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc index e1c497c..09e3353 100644 --- a/chrome/browser/chromeos/drive/resource_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/resource_metadata_unittest.cc @@ -13,10 +13,10 @@ #include "base/strings/stringprintf.h" #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/search_metadata_unittest.cc b/chrome/browser/chromeos/drive/search_metadata_unittest.cc index 52243b9..feb1da6 100644 --- a/chrome/browser/chromeos/drive/search_metadata_unittest.cc +++ b/chrome/browser/chromeos/drive/search_metadata_unittest.cc @@ -11,10 +11,10 @@ #include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_system_core_util.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/drive_api_util.h" #include "content/public/test/test_browser_thread_bundle.h" #include "testing/gtest/include/gtest/gtest.h" diff --git a/chrome/browser/chromeos/drive/sync_client_unittest.cc b/chrome/browser/chromeos/drive/sync_client_unittest.cc index 377251f..4c2b6db 100644 --- a/chrome/browser/chromeos/drive/sync_client_unittest.cc +++ b/chrome/browser/chromeos/drive/sync_client_unittest.cc @@ -15,6 +15,7 @@ #include "base/thread_task_runner_handle.h" #include "chrome/browser/chromeos/drive/change_list_loader.h" #include "chrome/browser/chromeos/drive/drive.pb.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_free_disk_space_getter.h" #include "chrome/browser/chromeos/drive/file_cache.h" #include "chrome/browser/chromeos/drive/file_change.h" @@ -25,7 +26,6 @@ #include "chrome/browser/chromeos/drive/job_scheduler.h" #include "chrome/browser/chromeos/drive/resource_entry_conversion.h" #include "chrome/browser/chromeos/drive/resource_metadata.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/event_logger.h" #include "chrome/browser/drive/fake_drive_service.h" #include "content/public/test/test_browser_thread_bundle.h" diff --git a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc index 92a6698..f3bc8d4 100644 --- a/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc +++ b/chrome/browser/chromeos/extensions/file_manager/file_manager_private_apitest.cc @@ -6,8 +6,8 @@ #include "base/stl_util.h" #include "chrome/browser/chromeos/drive/file_change.h" #include "chrome/browser/chromeos/extensions/file_manager/event_router.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.h" #include "chrome/browser/chromeos/file_manager/file_watcher.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h" #include "chrome/browser/extensions/extension_apitest.h" #include "chrome/common/extensions/api/file_system_provider_capabilities/file_system_provider_capabilities_handler.h" diff --git a/chrome/browser/chromeos/extensions/launcher_search_provider.cc b/chrome/browser/chromeos/extensions/launcher_search_provider.cc index 70cf024..f041e1e 100644 --- a/chrome/browser/chromeos/extensions/launcher_search_provider.cc +++ b/chrome/browser/chromeos/extensions/launcher_search_provider.cc @@ -6,7 +6,7 @@ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "chrome/common/extensions/api/launcher_search_provider.h" #include "content/public/browser/render_frame_host.h" diff --git a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc index 1e8a372..c4cbcc7 100644 --- a/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc +++ b/chrome/browser/chromeos/file_manager/external_filesystem_apitest.cc @@ -10,7 +10,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/chromeos/profiles/profile_helper.h" #include "chrome/browser/drive/fake_drive_service.h" diff --git a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc index 06953e9..11f0dc8 100644 --- a/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc +++ b/chrome/browser/chromeos/file_manager/file_manager_browsertest_base.cc @@ -15,7 +15,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chromeos/drive/file_system_interface.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "chrome/browser/chromeos/file_manager/path_util.h" #include "chrome/browser/chromeos/file_manager/volume_manager.h" #include "chrome/browser/drive/fake_drive_service.h" diff --git a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc index 0b837e2..a7065db 100644 --- a/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc +++ b/chrome/browser/chromeos/file_manager/fileapi_util_unittest.cc @@ -3,10 +3,10 @@ // found in the LICENSE file. #include "chrome/browser/chromeos/drive/drive_integration_service.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" -#include "chrome/browser/chromeos/drive/test_util.h" -#include "chrome/browser/chromeos/file_manager/drive_test_util.cc" #include "chrome/browser/chromeos/file_manager/fileapi_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.cc" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "chrome/test/base/testing_browser_process.h" diff --git a/chrome/browser/chromeos/file_manager/drive_test_util.cc b/chrome/browser/chromeos/file_manager/mount_test_util.cc index 89af97e..df0e5e4 100644 --- a/chrome/browser/chromeos/file_manager/drive_test_util.cc +++ b/chrome/browser/chromeos/file_manager/mount_test_util.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/file_manager/drive_test_util.h" +#include "chrome/browser/chromeos/file_manager/mount_test_util.h" #include "base/run_loop.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" diff --git a/chrome/browser/chromeos/file_manager/drive_test_util.h b/chrome/browser/chromeos/file_manager/mount_test_util.h index fb98cd4..db024a0 100644 --- a/chrome/browser/chromeos/file_manager/drive_test_util.h +++ b/chrome/browser/chromeos/file_manager/mount_test_util.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_DRIVE_TEST_UTIL_H_ -#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_DRIVE_TEST_UTIL_H_ +#ifndef CHROME_BROWSER_CHROMEOS_FILE_MANAGER_MOUNT_TEST_UTIL_H_ +#define CHROME_BROWSER_CHROMEOS_FILE_MANAGER_MOUNT_TEST_UTIL_H_ class Profile; @@ -18,4 +18,4 @@ void WaitUntilDriveMountPointIsAdded(Profile* profile); } // namespace test_util } // namespace file_manager -#endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_DRIVE_TEST_UTIL_H_ +#endif // CHROME_BROWSER_CHROMEOS_FILE_MANAGER_MOUNT_TEST_UTIL_H_ diff --git a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc index 8795336..658f810 100644 --- a/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc +++ b/chrome/browser/chromeos/fileapi/external_file_url_request_job_unittest.cc @@ -12,9 +12,9 @@ #include "base/threading/thread.h" #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h" #include "chrome/browser/chromeos/drive/drive_integration_service.h" +#include "chrome/browser/chromeos/drive/drive_test_util.h" #include "chrome/browser/chromeos/drive/fake_file_system.h" #include "chrome/browser/chromeos/drive/file_system_util.h" -#include "chrome/browser/chromeos/drive/test_util.h" #include "chrome/browser/drive/fake_drive_service.h" #include "chrome/browser/drive/test_util.h" #include "chrome/browser/prefs/browser_prefs.h" diff --git a/chrome/browser/chromeos/first_run/first_run_browsertest.cc b/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc index 4801d50..4801d50 100644 --- a/chrome/browser/chromeos/first_run/first_run_browsertest.cc +++ b/chrome/browser/chromeos/first_run/chromeos_first_run_browsertest.cc diff --git a/chrome/browser/chromeos/launcher_search_provider/service.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc index 64439e4..36547f03 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service.cc +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc @@ -2,11 +2,11 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "base/memory/scoped_vector.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/chromeos/launcher_search_provider/service_factory.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h" #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.h" #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.h" #include "extensions/browser/extension_registry.h" diff --git a/chrome/browser/chromeos/launcher_search_provider/service.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h index 8ff5c85..6536d19 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service.h +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ -#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ +#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ +#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ #include "base/memory/scoped_ptr.h" #include "chrome/browser/chromeos/launcher_search_provider/error_reporter.h" @@ -88,4 +88,4 @@ class Service : public KeyedService, } // namespace launcher_search_provider } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ +#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_H_ diff --git a/chrome/browser/chromeos/launcher_search_provider/service_factory.cc b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc index d89ad96..cf49dde 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service_factory.cc +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/chromeos/launcher_search_provider/service_factory.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "components/keyed_service/content/browser_context_dependency_manager.h" #include "extensions/browser/extension_registry.h" #include "extensions/browser/extension_registry_factory.h" diff --git a/chrome/browser/chromeos/launcher_search_provider/service_factory.h b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h index d2dcbc7..8da5962 100644 --- a/chrome/browser/chromeos/launcher_search_provider/service_factory.h +++ b/chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ -#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ +#ifndef CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ +#define CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ #include "base/memory/singleton.h" #include "components/keyed_service/content/browser_context_keyed_service_factory.h" @@ -40,4 +40,4 @@ class ServiceFactory : public BrowserContextKeyedServiceFactory { } // namespace launcher_search_provider } // namespace chromeos -#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ +#endif // CHROME_BROWSER_CHROMEOS_LAUNCHER_SEARCH_PROVIDER_LAUNCHER_SEARCH_PROVIDER_SERVICE_FACTORY_H_ diff --git a/chrome/browser/chromeos/preferences_browsertest.cc b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc index ef44d88..ef44d88 100644 --- a/chrome/browser/chromeos/preferences_browsertest.cc +++ b/chrome/browser/chromeos/preferences_chromeos_browsertest.cc diff --git a/chrome/browser/extensions/api/chrome_extensions_api_client.cc b/chrome/browser/extensions/api/chrome_extensions_api_client.cc index 8d5eca6..d8cabfb 100644 --- a/chrome/browser/extensions/api/chrome_extensions_api_client.cc +++ b/chrome/browser/extensions/api/chrome_extensions_api_client.cc @@ -11,7 +11,7 @@ #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h" #include "chrome/browser/extensions/api/web_request/chrome_extension_web_request_event_router_delegate.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h" #include "chrome/browser/guest_view/extension_options/chrome_extension_options_guest_delegate.h" #include "chrome/browser/guest_view/mime_handler_view/chrome_mime_handler_view_guest_delegate.h" diff --git a/chrome/browser/favicon/favicon_helper.cc b/chrome/browser/favicon/favicon_utils.cc index 214c28b..7be1942 100644 --- a/chrome/browser/favicon/favicon_helper.cc +++ b/chrome/browser/favicon/favicon_utils.cc @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/bookmarks/bookmark_model_factory.h" #include "chrome/browser/favicon/favicon_service_factory.h" diff --git a/chrome/browser/favicon/favicon_helper.h b/chrome/browser/favicon/favicon_utils.h index 9b9af36..e8b8ad0 100644 --- a/chrome/browser/favicon/favicon_helper.h +++ b/chrome/browser/favicon/favicon_utils.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef CHROME_BROWSER_FAVICON_FAVICON_HELPER_H_ -#define CHROME_BROWSER_FAVICON_FAVICON_HELPER_H_ +#ifndef CHROME_BROWSER_FAVICON_FAVICON_UTILS_H_ +#define CHROME_BROWSER_FAVICON_FAVICON_UTILS_H_ #include "components/favicon/content/content_favicon_driver.h" @@ -23,4 +23,4 @@ bool ShouldDisplayFavicon(content::WebContents* web_contents); } // namespace favicon -#endif // CHROME_BROWSER_FAVICON_FAVICON_HELPER_H_ +#endif // CHROME_BROWSER_FAVICON_FAVICON_UTILS_H_ diff --git a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc index 0a1dda0..db78792 100644 --- a/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc +++ b/chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc @@ -6,7 +6,7 @@ #include "chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/renderer_context_menu/render_view_context_menu.h" #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h" diff --git a/chrome/browser/task_management/providers/web_contents/renderer_task.cc b/chrome/browser/task_management/providers/web_contents/renderer_task.cc index 32acdb1..f4f4890f 100644 --- a/chrome/browser/task_management/providers/web_contents/renderer_task.cc +++ b/chrome/browser/task_management/providers/web_contents/renderer_task.cc @@ -7,7 +7,7 @@ #include "base/i18n/rtl.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_info_cache.h" #include "chrome/browser/profiles/profile_manager.h" diff --git a/chrome/browser/task_manager/printing_information.cc b/chrome/browser/task_manager/printing_information.cc index 4f9d6f1..ac0d904 100644 --- a/chrome/browser/task_manager/printing_information.cc +++ b/chrome/browser/task_manager/printing_information.cc @@ -7,7 +7,7 @@ #include "base/strings/string16.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/printing/background_printing_manager.h" #include "chrome/browser/printing/print_preview_dialog_controller.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/task_manager/tab_contents_information.cc b/chrome/browser/task_manager/tab_contents_information.cc index c810e91..05ce45b 100644 --- a/chrome/browser/task_manager/tab_contents_information.cc +++ b/chrome/browser/task_manager/tab_contents_information.cc @@ -8,7 +8,7 @@ #include "base/strings/utf_string_conversions.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/devtools/devtools_window.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/prerender/prerender_manager.h" #include "chrome/browser/prerender/prerender_manager_factory.h" #include "chrome/browser/profiles/profile.h" diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc index 6ed2ee6..5645fc0 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_provider.cc @@ -6,7 +6,7 @@ #include "base/stl_util.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" using chromeos::launcher_search_provider::Service; diff --git a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc index 0bdd764..34c3bf7 100644 --- a/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc +++ b/chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.cc @@ -5,7 +5,7 @@ #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_result.h" #include "base/strings/utf_string_conversions.h" -#include "chrome/browser/chromeos/launcher_search_provider/service.h" +#include "chrome/browser/chromeos/launcher_search_provider/launcher_search_provider_service.h" #include "chrome/browser/ui/app_list/search/launcher_search/launcher_search_icon_image_loader_impl.h" #include "chrome/browser/ui/app_list/search/search_util.h" diff --git a/chrome/browser/ui/apps/chrome_app_delegate.cc b/chrome/browser/ui/apps/chrome_app_delegate.cc index 1103dd0..acba1a3 100644 --- a/chrome/browser/ui/apps/chrome_app_delegate.cc +++ b/chrome/browser/ui/apps/chrome_app_delegate.cc @@ -10,7 +10,7 @@ #include "chrome/browser/apps/scoped_keep_alive.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/file_select_helper.h" #include "chrome/browser/media/media_capture_devices_dispatcher.h" #include "chrome/browser/platform_util.h" diff --git a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm index fefd239..28b3e0c 100644 --- a/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm +++ b/chrome/browser/ui/cocoa/tabs/tab_strip_controller.mm @@ -19,7 +19,7 @@ #include "chrome/app/chrome_command_ids.h" #include "chrome/browser/autocomplete/autocomplete_classifier_factory.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/themes/theme_service.h" diff --git a/chrome/browser/ui/panels/panel_host.cc b/chrome/browser/ui/panels/panel_host.cc index 2e06dd2..2fbc91c 100644 --- a/chrome/browser/ui/panels/panel_host.cc +++ b/chrome/browser/ui/panels/panel_host.cc @@ -12,7 +12,7 @@ #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" #include "chrome/browser/extensions/window_controller.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/sessions/session_tab_helper.h" #include "chrome/browser/ui/browser_navigator.h" diff --git a/chrome/browser/ui/tab_helpers.cc b/chrome/browser/ui/tab_helpers.cc index 1f52a63..9148e04 100644 --- a/chrome/browser/ui/tab_helpers.cc +++ b/chrome/browser/ui/tab_helpers.cc @@ -11,7 +11,7 @@ #include "chrome/browser/engagement/site_engagement_helper.h" #include "chrome/browser/engagement/site_engagement_service.h" #include "chrome/browser/external_protocol/external_protocol_observer.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/history/history_tab_helper.h" #include "chrome/browser/history/top_sites_factory.h" #include "chrome/browser/infobars/infobar_service.h" diff --git a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc index 904fec6..904fec6 100644 --- a/chrome/browser/ui/views/find_bar_host_interactive_uitest.cc +++ b/chrome/browser/ui/views/find_bar_views_interactive_uitest.cc diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc index f501504..ddce28b 100644 --- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc +++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc @@ -12,7 +12,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_notification_types.h" #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #include "chrome/browser/profiles/profile.h" #include "chrome/browser/search/search.h" #include "chrome/browser/ui/browser.h" diff --git a/chrome/browser/web_applications/web_app_unittest.cc b/chrome/browser/web_applications/web_app_unittest.cc index 76276b6..38ef896 100644 --- a/chrome/browser/web_applications/web_app_unittest.cc +++ b/chrome/browser/web_applications/web_app_unittest.cc @@ -16,7 +16,7 @@ #if defined(TOOLKIT_VIEWS) #include "chrome/browser/extensions/tab_helper.h" -#include "chrome/browser/favicon/favicon_helper.h" +#include "chrome/browser/favicon/favicon_utils.h" #endif using content::RenderViewHostTester; diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index 02bf48c..6718aad 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -1634,8 +1634,8 @@ 'browser/favicon/chrome_favicon_client.h', 'browser/favicon/fallback_icon_service_factory.cc', 'browser/favicon/fallback_icon_service_factory.h', - 'browser/favicon/favicon_helper.cc', - 'browser/favicon/favicon_helper.h', + 'browser/favicon/favicon_utils.cc', + 'browser/favicon/favicon_utils.h', 'browser/favicon/favicon_service_factory.cc', 'browser/favicon/favicon_service_factory.h', 'browser/favicon/large_icon_service_factory.cc', diff --git a/chrome/chrome_browser_chromeos.gypi b/chrome/chrome_browser_chromeos.gypi index 02117ff..f73366c 100644 --- a/chrome/chrome_browser_chromeos.gypi +++ b/chrome/chrome_browser_chromeos.gypi @@ -424,10 +424,10 @@ 'browser/chromeos/language_preferences.h', 'browser/chromeos/launcher_search_provider/error_reporter.cc', 'browser/chromeos/launcher_search_provider/error_reporter.h', - 'browser/chromeos/launcher_search_provider/service.cc', - 'browser/chromeos/launcher_search_provider/service.h', - 'browser/chromeos/launcher_search_provider/service_factory.cc', - 'browser/chromeos/launcher_search_provider/service_factory.h', + 'browser/chromeos/launcher_search_provider/launcher_search_provider_service.cc', + 'browser/chromeos/launcher_search_provider/launcher_search_provider_service.h', + 'browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.cc', + 'browser/chromeos/launcher_search_provider/launcher_search_provider_service_factory.h', 'browser/chromeos/locale_change_guard.cc', 'browser/chromeos/locale_change_guard.h', 'browser/chromeos/login/app_launch_controller.cc', diff --git a/chrome/chrome_tests.gni b/chrome/chrome_tests.gni index 6886ea6..f8f9976 100644 --- a/chrome/chrome_tests.gni +++ b/chrome/chrome_tests.gni @@ -8,3 +8,8 @@ chrome_tests_gypi_values = exec_script("//build/gypi_to_gn.py", [ rebase_path("chrome_tests.gypi") ], "scope", [ "chrome_tests.gypi" ]) +chrome_tests_unit_gypi_values = + exec_script("//build/gypi_to_gn.py", + [ rebase_path("chrome_tests_unit.gypi") ], + "scope", + [ "chrome_tests_unit.gypi" ]) diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index acd8247..7c28595 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -20,11 +20,10 @@ 'browser/extensions/updater/extension_cache_fake.cc', 'browser/extensions/updater/extension_cache_fake.h', ], - 'chrome_browser_tests_sources': [ - # The list of sources which is only used by chrome browser tests. - '../apps/app_restore_service_browsertest.cc', - '../apps/load_and_launch_browsertest.cc', - # TODO(rockot): Remove this once extensions_browsertests exists. + # TODO(rockot) bug 505926: These should be moved to extensions_browsertests + # but have old dependencies on chrome files. The chrome dependencies should + # be removed and these moved to the extensions_browsertests target. + 'chrome_browser_tests_extensions_sources': [ '../extensions/browser/api/app_window/app_window_apitest.cc', '../extensions/browser/api/bluetooth/bluetooth_apitest.cc', '../extensions/browser/api/bluetooth/bluetooth_private_apitest.cc', @@ -38,6 +37,11 @@ '../extensions/browser/guest_view/mime_handler_view/mime_handler_view_browsertest.cc', '../extensions/renderer/console_apitest.cc', '../extensions/renderer/script_context_browsertest.cc', + ], + 'chrome_browser_tests_sources': [ + # The list of sources which is only used by chrome browser tests. + '../apps/app_restore_service_browsertest.cc', + '../apps/load_and_launch_browsertest.cc', 'app/chrome_command_ids.h', 'app/chrome_dll.rc', 'app/chrome_dll_resource.h', @@ -48,6 +52,7 @@ 'browser/apps/app_shim/app_shim_host_manager_browsertest_mac.mm', 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.cc', 'browser/apps/app_shim/test/app_shim_host_manager_test_api_mac.h', + 'browser/apps/app_speech_recognition_browsertest.cc', 'browser/apps/app_url_redirector_browsertest.cc', 'browser/apps/app_window_browsertest.cc', 'browser/apps/ephemeral_app_browsertest.cc', @@ -58,7 +63,6 @@ 'browser/apps/guest_view/app_view_browsertest.cc', 'browser/apps/guest_view/extension_view/extension_view_browsertest.cc', 'browser/apps/guest_view/web_view_browsertest.cc', - 'browser/apps/speech_recognition_browsertest.cc', 'browser/apps/window_controls_browsertest.cc', 'browser/autocomplete/autocomplete_browsertest.cc', 'browser/autofill/autofill_browsertest.cc', @@ -653,8 +657,8 @@ 'browser/chromeos/device/input_service_proxy_browsertest.cc', 'browser/chromeos/drive/drive_integration_service_browsertest.cc', 'browser/chromeos/drive/drive_notification_manager_factory_browsertest.cc', - 'browser/chromeos/drive/test_util.cc', - 'browser/chromeos/drive/test_util.h', + 'browser/chromeos/drive/drive_test_util.cc', + 'browser/chromeos/drive/drive_test_util.h', 'browser/chromeos/extensions/accessibility_features_apitest.cc', 'browser/chromeos/extensions/echo_private_apitest.cc', 'browser/chromeos/extensions/file_manager/file_browser_handler_api_test.cc', @@ -670,8 +674,6 @@ 'browser/chromeos/extensions/wallpaper_private_apitest.cc', 'browser/chromeos/file_manager/audio_player_browsertest.cc', 'browser/chromeos/file_manager/gallery_browsertest.cc', - 'browser/chromeos/file_manager/drive_test_util.cc', - 'browser/chromeos/file_manager/drive_test_util.h', 'browser/chromeos/file_manager/external_filesystem_apitest.cc', 'browser/chromeos/file_manager/file_manager_browsertest_base.cc', 'browser/chromeos/file_manager/file_manager_browsertest_base.h', @@ -679,12 +681,14 @@ 'browser/chromeos/file_manager/file_manager_jstest.cc', 'browser/chromeos/file_manager/file_manager_jstest_base.cc', 'browser/chromeos/file_manager/file_manager_jstest_base.h', + 'browser/chromeos/file_manager/mount_test_util.cc', + 'browser/chromeos/file_manager/mount_test_util.h', 'browser/chromeos/file_manager/video_player_browsertest.cc', 'browser/chromeos/file_manager/gallery_jstest.cc', 'browser/chromeos/file_manager/image_loader_jstest.cc', 'browser/chromeos/file_manager/zip_file_creator_browsertest.cc', 'browser/chromeos/first_run/drive_first_run_browsertest.cc', - 'browser/chromeos/first_run/first_run_browsertest.cc', + 'browser/chromeos/first_run/chromeos_first_run_browsertest.cc', 'browser/chromeos/input_method/input_method_engine_browsertests.cc', 'browser/chromeos/input_method/mode_indicator_browsertest.cc', 'browser/chromeos/login/crash_restore_browsertest.cc', @@ -780,7 +784,7 @@ 'browser/chromeos/policy/user_policy_test_helper.h', 'browser/chromeos/policy/variations_service_policy_browsertest.cc', 'browser/chromeos/power/peripheral_battery_observer_browsertest.cc', - 'browser/chromeos/preferences_browsertest.cc', + 'browser/chromeos/preferences_chromeos_browsertest.cc', 'browser/chromeos/profiles/profile_helper_browsertest.cc', 'browser/chromeos/settings/scoped_cros_settings_test_helper.cc', 'browser/chromeos/settings/scoped_cros_settings_test_helper.h', @@ -946,8 +950,14 @@ 'test/data/webui/print_preview.js', 'test/data/webui/sandboxstatus_browsertest.js', ], - 'chrome_interactive_ui_test_sources': [ + # TODO(rockot) bug 505926: These should be moved to a target in + # //extensions but have old dependencies on chrome files. The chrome + # dependencies should be removed and these moved to the + # extensions_browsertests target. + 'chrome_interactive_ui_test_extensions_sources': [ '../extensions/browser/app_window/app_window_interactive_uitest.cc', + ], + 'chrome_interactive_ui_test_sources': [ '../ui/base/clipboard/clipboard_android_unittest.cc', '../ui/base/clipboard/clipboard_unittest.cc', 'browser/apps/app_browsertest_util.cc', @@ -1085,7 +1095,7 @@ 'browser/ui/views/constrained_window_views_browsertest.cc', 'browser/ui/views/extensions/extension_dialog_interactive_uitest.cc', 'browser/ui/views/find_bar_controller_interactive_uitest.cc', - 'browser/ui/views/find_bar_host_interactive_uitest.cc', + 'browser/ui/views/find_bar_views_interactive_uitest.cc', 'browser/ui/views/frame/browser_view_focus_uitest.cc', 'browser/ui/views/frame/browser_view_interactive_uitest.cc', 'browser/ui/views/keyboard_access_browsertest.cc', @@ -1556,6 +1566,7 @@ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], 'sources': [ + '<@(chrome_interactive_ui_test_extensions_sources)', '<@(chrome_interactive_ui_test_sources)', ], 'conditions': [ @@ -2072,6 +2083,7 @@ 'HAS_OUT_OF_PROC_TEST_RUNNER', ], 'sources': [ + '<@(chrome_browser_tests_extensions_sources)', '<@(chrome_browser_tests_sources)', '<@(chrome_browser_tests_webui_js_sources)', '<@(chrome_browser_extensions_test_support_sources)', diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi index 15d3be3..e71949f 100644 --- a/chrome/chrome_tests_unit.gypi +++ b/chrome/chrome_tests_unit.gypi @@ -847,9 +847,9 @@ 'browser/web_applications/web_app_mac_unittest.mm', 'browser/web_applications/web_app_unittest.cc', 'common/extensions/api/commands/commands_manifest_unittest.cc', + 'common/extensions/api/common_extension_api_unittest.cc', 'common/extensions/api/extension_action/browser_action_manifest_unittest.cc', 'common/extensions/api/extension_action/page_action_manifest_unittest.cc', - 'common/extensions/api/extension_api_unittest.cc', 'common/extensions/api/storage/storage_schema_manifest_handler_unittest.cc', 'common/extensions/chrome_extensions_client_unittest.cc', 'common/extensions/command_unittest.cc', @@ -1194,8 +1194,8 @@ 'browser/chromeos/drive/sync/entry_update_performer_unittest.cc', 'browser/chromeos/drive/sync/remove_performer_unittest.cc', 'browser/chromeos/drive/sync_client_unittest.cc', - 'browser/chromeos/drive/test_util.cc', - 'browser/chromeos/drive/test_util.h', + 'browser/chromeos/drive/drive_test_util.cc', + 'browser/chromeos/drive/drive_test_util.h', 'browser/chromeos/drive/write_on_cache_file_unittest.cc', 'browser/chromeos/events/event_rewriter_unittest.cc', 'browser/chromeos/events/keyboard_driven_event_rewriter_unittest.cc', diff --git a/chrome/common/extensions/api/extension_api_unittest.cc b/chrome/common/extensions/api/common_extension_api_unittest.cc index aed0671..aed0671 100644 --- a/chrome/common/extensions/api/extension_api_unittest.cc +++ b/chrome/common/extensions/api/common_extension_api_unittest.cc diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index ac570ff..a430bfa 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -6,6 +6,7 @@ import("//build/config/chrome_build.gni") import("//build/config/crypto.gni") import("//build/config/features.gni") import("//build/config/ui.gni") +import("//chrome/chrome_tests.gni") import("//chrome/test/base/js2gtest.gni") import("//testing/test.gni") @@ -204,7 +205,6 @@ source_set("test_support") { } if (!is_android) { - import("//chrome/chrome_tests.gni") import("//third_party/protobuf/proto_library.gni") # GYP version: chrome/chrome_tests_unit.gypi:ipc_protobuf_message_test_proto @@ -253,6 +253,11 @@ if (!is_android) { "//ui/web_dialogs:test_support", ] + # TODO(rockot) bug 505926: The chrome_extensions_interactive_uitests target + # should be deleted and this line removed. See the + # chrome_extensions_interactive_uitests target for more. + deps += [ "//extensions:chrome_extensions_interactive_uitests" ] + # Runtime dependencies datadeps = [ "//ppapi:ppapi_tests", @@ -596,6 +601,11 @@ if (!is_android) { "//v8", ] + # TODO(rockot) bug 505926: The chrome_extensions_browsertests target should + # be deleted and this line removed. See the chrome_extensions_browsertests + # target for more. + deps += [ "//extensions:chrome_extensions_browsertests" ] + # Runtime dependencies data_deps = [ "//ppapi:ppapi_tests", @@ -1107,34 +1117,33 @@ if (!is_android) { } } - unit_gypi_values = exec_script("//build/gypi_to_gn.py", - [ rebase_path("../chrome_tests_unit.gypi") ], - "scope", - [ "../chrome_tests_unit.gypi" ]) - js2gtest("unit_tests_js") { test_type = "unit" - sources = rebase_path(unit_gypi_values.chrome_unit_tests_gtestjs_sources, - ".", - "//chrome") - extra_js_files = rebase_path(unit_gypi_values.chrome_unit_tests_js_sources, - ".", - "//chrome") + sources = rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_gtestjs_sources, + ".", + "//chrome") + extra_js_files = + rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_js_sources, + ".", + "//chrome") if (is_chromeos) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_chromeos_gtestjs_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_gtestjs_sources, + ".", + "//chrome") + extra_js_files += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_chromeos_js_sources, ".", "//chrome") - extra_js_files += - rebase_path(unit_gypi_values.chrome_unit_tests_chromeos_js_sources, - ".", - "//chrome") } } test("unit_tests") { sources = - rebase_path(unit_gypi_values.chrome_unit_tests_sources, ".", "//chrome") + rebase_path(chrome_tests_unit_gypi_values.chrome_unit_tests_sources, + ".", + "//chrome") defines = [] @@ -1221,26 +1230,26 @@ if (!is_android) { deps += [ "//testing/android/native_test:native_test_native_code" ] isolate_file = "../unit_tests.isolate" } else { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_non_android_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_sources, + ".", + "//chrome") } if (is_ios || is_chromeos) { sources -= [ "../browser/metrics/signin_status_metrics_provider_unittest.cc" ] } if (enable_background) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_background_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_background_sources, + ".", + "//chrome") } if (enable_spellcheck) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_spellchecker_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_spellchecker_sources, + ".", + "//chrome") if (is_mac && !is_ios) { deps += [ "//third_party/hunspell" ] } @@ -1254,10 +1263,10 @@ if (!is_android) { } if (enable_extensions) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_extensions_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_sources, + ".", + "//chrome") deps += [ "//chrome/common/extensions/api", "//device/usb:mocks", @@ -1266,13 +1275,13 @@ if (!is_android) { ] if (enable_configuration_policy) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_extensions_policy_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_policy_sources, ".", "//chrome") } if (!is_chromeos) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_extensions_non_chromeos_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_non_chromeos_sources, ".", "//chrome") } @@ -1283,20 +1292,22 @@ if (!is_android) { "//ui/views", "//ui/views:test_support", ] - sources += rebase_path(unit_gypi_values.chrome_unit_tests_views_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_views_sources, + ".", + "//chrome") if (!is_mac) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_views_non_mac_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_views_non_mac_sources, ".", "//chrome") } } if (use_ash) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_ash_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_ash_sources, + ".", + "//chrome") deps += [ "//ash:test_support", "//ash/resources", @@ -1318,10 +1329,10 @@ if (!is_android) { ] } if (!is_chromeos && is_linux) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_desktop_linux_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_desktop_linux_sources, + ".", + "//chrome") } if (!is_chromeos && !use_ozone && is_linux) { deps += [ @@ -1331,25 +1342,26 @@ if (!is_android) { } if (enable_task_manager) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_task_manager_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_task_manager_sources, + ".", + "//chrome") } if (enable_mdns) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_mdns_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_mdns_sources, + ".", + "//chrome") } if (enable_service_discovery) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_service_discovery_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_service_discovery_sources, ".", "//chrome") } if (enable_configuration_policy) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_configuration_policy_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_configuration_policy_sources, ".", "//chrome") if (is_chromeos) { @@ -1368,15 +1380,16 @@ if (!is_android) { } } if (enable_web_speech) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_speech_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_speech_sources, + ".", + "//chrome") } if (enable_notifications) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_notifications_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_notifications_sources, + ".", + "//chrome") if (is_android) { sources -= [ # Android does not use the Message Center notification system. @@ -1388,7 +1401,7 @@ if (!is_android) { if (safe_browsing_mode == 1) { # TODO(sgurun): enable tests for safe_browsing==2. sources += rebase_path( - unit_gypi_values.chrome_unit_tests_full_safe_browsing_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_full_safe_browsing_sources, ".", "//chrome") deps += [ ":test_proto" ] @@ -1407,57 +1420,52 @@ if (!is_android) { } if (enable_autofill_dialog && !is_android) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_autofill_dialog_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_autofill_dialog_sources, ".", "//chrome") } if (enable_plugins) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_plugins_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_plugins_sources, + ".", + "//chrome") } if (enable_print_preview) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_print_preview_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_print_preview_sources, + ".", + "//chrome") } if (enable_captive_portal_detection) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_captive_portal_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_captive_portal_sources, + ".", + "//chrome") } if (enable_session_service) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_session_service_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_session_service_sources, ".", "//chrome") } if (enable_media_router) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_media_router_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_media_router_sources, + ".", + "//chrome") deps += [ "//chrome/browser/media/router:test_support" ] if (!toolkit_views) { sources -= [ "../browser/ui/views/media_router/media_router_ui_browsertest.cc" ] } } if (enable_webrtc) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_webrtc_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_webrtc_sources, + ".", + "//chrome") } if (is_chromeos) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_chromeos_sources, - ".", - "//chrome") - deps += [ - "//ash/resources", - "//ui/chromeos/resources", - ] + deps += [ "//chrome/browser/chromeos:unit_tests" ] sources -= [ "../browser/signin/signin_global_error_unittest.cc", "../browser/signin/signin_manager_unittest.cc", @@ -1502,9 +1510,10 @@ if (!is_android) { ldflags = [ "-Wl,--strip-debug" ] } if (is_mac) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_mac_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_mac_sources, + ".", + "//chrome") sources -= [ "../browser/ui/tests/ui_gfx_image_unittest.cc", "../renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc", @@ -1532,9 +1541,10 @@ if (!is_android) { ] } if (is_win || is_mac) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_mac_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_win_mac_sources, + ".", + "//chrome") } if (is_win || is_mac || is_chromeos) { sources += [ "../common/extensions/api/networking_private/networking_private_crypto_unittest.cc" ] @@ -1551,9 +1561,10 @@ if (!is_android) { #'LinkIncremental': '<(msvs_debug_link_nonincremental)', TODO(GYP) } - sources += rebase_path(unit_gypi_values.chrome_unit_tests_win_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_win_sources, + ".", + "//chrome") deps += [ #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_1', TODO(GYP) #'browser/safe_browsing/incident_reporting/verifier_test/verifier_unittest.gyp:verifier_test_dll_2', TODO(GYP) @@ -1595,27 +1606,28 @@ if (!is_android) { } if (!is_android && !is_chromeos) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_non_android_or_chromeos_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_non_android_or_chromeos_sources, ".", "//chrome") } if (enable_themes) { - sources += rebase_path(unit_gypi_values.chrome_unit_tests_themes_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_themes_sources, + ".", + "//chrome") } if (!is_android && (use_nss_certs || use_openssl_certs)) { sources += [ "../common/net/x509_certificate_model_unittest.cc" ] } if (enable_supervised_users) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_supervised_user_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_supervised_user_sources, ".", "//chrome") } if (enable_supervised_users && !is_android && !is_ios) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_supervised_user_legacy_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_supervised_user_legacy_sources, ".", "//chrome") } @@ -1628,15 +1640,15 @@ if (!is_android) { deps += [ "//third_party/cld" ] } if (enable_app_list) { - sources += - rebase_path(unit_gypi_values.chrome_unit_tests_app_list_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_sources, + ".", + "//chrome") deps += [ "//ui/app_list:test_support" ] } if (enable_app_list && is_chromeos) { sources += rebase_path( - unit_gypi_values.chrome_unit_tests_app_list_chromeos_sources, + chrome_tests_unit_gypi_values.chrome_unit_tests_app_list_chromeos_sources, ".", "//chrome") } @@ -1748,9 +1760,9 @@ source_set("test_support_unit") { ] if (!is_android && use_ash) { - sources += - rebase_path(unit_gypi_values.chrome_test_support_unit_ash_sources, - ".", - "//chrome") + sources += rebase_path( + chrome_tests_unit_gypi_values.chrome_test_support_unit_ash_sources, + ".", + "//chrome") } } diff --git a/components/policy/BUILD.gn b/components/policy/BUILD.gn index 371acd3..38998d9 100644 --- a/components/policy/BUILD.gn +++ b/components/policy/BUILD.gn @@ -209,7 +209,7 @@ if (enable_configuration_policy) { defines = [ "POLICY_COMPONENT_IMPLEMENTATION" ] - deps = [ + public_deps = [ ":cloud_policy_code_generate", ":cloud_policy_proto_generated_compile", "//base", diff --git a/components/wallpaper/BUILD.gn b/components/wallpaper/BUILD.gn index e52d39f..4c28343 100644 --- a/components/wallpaper/BUILD.gn +++ b/components/wallpaper/BUILD.gn @@ -26,6 +26,9 @@ component("wallpaper") { "wallpaper_manager_base.cc", "wallpaper_manager_base.h", ] + public_deps = [ + "//third_party/icu", + ] deps += [ "//chromeos", "//components/user_manager", diff --git a/content/test/BUILD.gn b/content/test/BUILD.gn index c924395..2ce71e0 100644 --- a/content/test/BUILD.gn +++ b/content/test/BUILD.gn @@ -22,12 +22,13 @@ content_tests_gypi_values = # GYP version //content/content_tests.gypi:test_support_content source_set("test_support") { testonly = true - public_deps = [] - deps = [ - "//cc/blink", + public_deps = [ "//content/public/app:both", "//content/public/browser", "//content/public/common", + ] + deps = [ + "//cc/blink", "//net:test_support", "//skia", "//storage/common", diff --git a/crypto/BUILD.gn b/crypto/BUILD.gn index c39a8db..a81bfa8 100644 --- a/crypto/BUILD.gn +++ b/crypto/BUILD.gn @@ -365,7 +365,7 @@ group("platform") { public_configs += [ "//third_party/nss:system_nss_no_ssl_config" ] } else { # Non-Linux platforms use the hermetic NSS from the tree. - deps += [ + public_deps = [ "//third_party/nss:nspr", "//third_party/nss:nss", ] diff --git a/extensions/BUILD.gn b/extensions/BUILD.gn index ea66ab1..949fbe1 100644 --- a/extensions/BUILD.gn +++ b/extensions/BUILD.gn @@ -2,6 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# TODO(rockot) bug 505926: Don't include chrome files from here. +# See chrome_browser_tests_extensions_sources below +import("//chrome/chrome_tests.gni") import("//extensions/extensions.gni") import("//testing/test.gni") import("//tools/grit/grit_rule.gni") @@ -224,3 +227,115 @@ test("extensions_browsertests") { deps += [ "shell:app_shell" ] # Needed for App Shell.app's Helper. } } + +# TODO(rockot) bug 505926: These should be moved to extensions_browsertests but have +# old dependencies on chrome files. The chrome dependencies should be removed +# and these moved to the extensions_browsertests target. Currently, we solve +# the problem by making this a source set and linking it into +# //chrome/test:browser_tests. +source_set("chrome_extensions_browsertests") { + testonly = true + sources = rebase_path( + chrome_tests_gypi_values.chrome_browser_tests_extensions_sources, + ".", + "//chrome") + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + + # These are the deps from browser_tests minus some internal Chrome ones that + # aren't allowed to be included here and that aren't needed. + deps = [ + "//base", + "//base:i18n", + "//base/allocator", + "//base/test:test_support", + "//chrome/browser", + "//chrome/browser/resources:extension_resource_demo", + "//chrome/common/extensions/api", + "//chrome/renderer", + "//components/autofill/content/browser:risk_proto", + "//components/autofill/content/browser/wallet:test_support", + "//components/autofill/content/renderer:test_support", + "//components/captive_portal:test_support", + "//components/dom_distiller/content", + "//components/dom_distiller/core:test_support", + "//components/guest_view/browser:test_support", + "//components/resources", + "//components/strings", + "//components/translate/core/common", + "//components/user_manager:test_support", + "//crypto:platform", + "//crypto:test_support", + "//device/bluetooth:mocks", + "//device/serial:test_support", + "//extensions/common/api", + "//google_apis:test_support", + "//media", + "//media/base:test_support", + "//media/cast:test_support", + "//net", + "//net:test_support", + "//sdch", + "//skia", + "//sync", + "//sync:test_support_sync_api", + "//testing/gmock", + "//testing/gtest", + "//testing/perf", + "//third_party/cacheinvalidation", + "//third_party/icu", + "//third_party/leveldatabase", + "//third_party/libaddressinput", + "//third_party/libjingle", + "//third_party/safe_browsing:test_support", + "//third_party/WebKit/public:blink", + "//third_party/webrtc/modules/desktop_capture", + "//third_party/widevine/cdm:version_h", + "//ui/accessibility:test_support", + "//ui/base:test_support", + "//ui/compositor:test_support", + "//ui/resources", + "//ui/web_dialogs:test_support", + "//v8", + ] +} + +# TODO(rockot) bug 505926: This should be deleted for the same reason as +# chrome_extensions_browsertests. +source_set("chrome_extensions_interactive_uitests") { + testonly = true + sources = rebase_path( + chrome_tests_gypi_values.chrome_interactive_ui_test_extensions_sources, + ".", + "//chrome") + + defines = [ "HAS_OUT_OF_PROC_TEST_RUNNER" ] + + # These are the deps from interactive_uitests minus some internal Chrome + # ones that aren't allowed to be included here and that aren't needed. + deps = [ + "//base/allocator", + "//chrome/browser", + "//chrome/browser/devtools", + "//chrome/renderer", + "//chrome/test:test_support", + "//content/app/resources", + "//crypto:platform", + "//crypto:test_support", + "//google_apis:test_support", + "//net", + "//net:net_resources", + "//net:test_support", + "//skia", + "//sync", + "//testing/gmock", + "//testing/gtest", + "//third_party/hunspell", + "//third_party/icu", + "//third_party/libpng", + "//third_party/zlib", + "//ui/base:test_support", + "//ui/resources:ui_test_pak", + "//ui/web_dialogs:test_support", + ] +} diff --git a/net/BUILD.gn b/net/BUILD.gn index 7a2b972..b5b3fde 100644 --- a/net/BUILD.gn +++ b/net/BUILD.gn @@ -1309,6 +1309,51 @@ executable("quic_server") { # TODO(GYP) make this compile on Android, we need some native test deps done. # TODO(GYP) Also doesn't work on Mac, need to figure out why not. if (!is_android && !is_mac) { + if (is_linux) { + # There are quic-related files with the same file name in different + # directories. With our current object file mapping, these produce the + # same .o files. Split these out into a second target to avoid the + # collision. + # TODO(rch) bug 505930: de-duplicate these names. + quic_dupe_files = [ + "tools/quic/quic_client_session_test.cc", + "tools/quic/test_tools/mock_quic_dispatcher.cc", + "tools/quic/test_tools/mock_quic_dispatcher.h", + "tools/quic/test_tools/quic_test_utils.cc", + "tools/quic/test_tools/quic_test_utils.h", + ] + source_set("quic_de_dupe") { + testonly = true + if (is_linux) { + sources = quic_dupe_files + + deps = [ + ":balsa", + ":extras", + ":http_server", + ":net", + ":simple_quic_tools", + ":test_support", + "//base", + "//base:i18n", + "//base:prefs_test_support", + "//base/allocator", + "//base/third_party/dynamic_annotations", + "//crypto", + "//crypto:platform", + "//crypto:test_support", + "//gin", + "//net/base/registry_controlled_domains", + "//sql", + "//testing/gmock", + "//testing/gtest", + "//third_party/zlib", + "//url", + ] + } + } + } + test("net_unittests") { sources = gypi_values.net_test_sources @@ -1345,11 +1390,13 @@ if (!is_android && !is_mac) { } if (is_linux) { sources += gypi_values.net_linux_test_sources + sources -= quic_dupe_files deps += [ ":balsa", + ":epoll_quic_tools", ":epoll_server", ":flip_in_mem_edsm_server_base", - ":epoll_quic_tools", + ":quic_de_dupe", ] } |