Componentize tests under search_engines

BUG=387985
TEST=components_unittests

Review URL: https://codereview.chromium.org/382663004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@282523 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 18 insertions, 26 deletions

diff --git a/chrome/browser/search_engines/DEPS b/chrome/browser/search_engines/DEPS
index 4048008..b787d52 100644
--- a/chrome/browser/search_engines/DEPS
+++ b/chrome/browser/search_engines/DEPS
@@ -1,14 +1,4 @@
 include_rules = [
+  "-chrome/browser/autocomplete",
   "-extensions",
 ]
-
-specific_include_rules = {
-  "search_host_to_urls_map_unittest\.": [
-    "-chrome",
-    "-content",
-  ],
-  "template_url_unittest\.": [
-    "-chrome",
-    "-content",
-  ],
-}
\ No newline at end of file
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 0e42b5c..43c293f 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -1276,19 +1276,13 @@
         'browser/search/suggestions/suggestions_service_unittest.cc',
         'browser/search/suggestions/suggestions_store_unittest.cc',
         'browser/search/suggestions/thumbnail_manager_unittest.cc',
-        'browser/search_engines/default_search_manager_unittest.cc',
         'browser/search_engines/default_search_pref_migration_unittest.cc',
-        'browser/search_engines/default_search_policy_handler_unittest.cc',
-        'browser/search_engines/search_host_to_urls_map_unittest.cc',
         'browser/search_engines/search_provider_install_data_unittest.cc',
         'browser/search_engines/template_url_fetcher_unittest.cc',
-        'browser/search_engines/template_url_service_util_unittest.cc',
+        'browser/search_engines/template_url_parser_unittest.cc',
         'browser/search_engines/template_url_service_sync_unittest.cc',
         'browser/search_engines/template_url_service_unittest.cc',
-        'browser/search_engines/template_url_parser_unittest.cc',
-        'browser/search_engines/template_url_prepopulate_data_unittest.cc',
         'browser/search_engines/template_url_scraper_unittest.cc',
-        'browser/search_engines/template_url_unittest.cc',
         'browser/services/gcm/fake_signin_manager.cc',
         'browser/services/gcm/fake_signin_manager.h',
         'browser/services/gcm/gcm_account_tracker_unittest.cc',
@@ -2266,7 +2260,6 @@
             'browser/net/proxy_policy_handler_unittest.cc',
             'browser/prefs/proxy_policy_unittest.cc',
             'browser/profiles/incognito_mode_policy_handler_unittest.cc',
-            'browser/search_engines/default_search_policy_handler_unittest.cc',
             'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
             'browser/sync/sync_policy_handler_unittest.cc',
           ],
diff --git a/components/components_tests.gyp b/components/components_tests.gyp
index e779aac..7a2342f 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -156,6 +156,12 @@
             'rappor/log_uploader_unittest.cc',
             'rappor/rappor_metric_unittest.cc',
             'rappor/rappor_service_unittest.cc',
+            'search_engines/default_search_manager_unittest.cc',
+            'search_engines/default_search_policy_handler_unittest.cc',
+            'search_engines/search_host_to_urls_map_unittest.cc',
+            'search_engines/template_url_prepopulate_data_unittest.cc',
+            'search_engines/template_url_service_util_unittest.cc',
+            'search_engines/template_url_unittest.cc',
             'search_provider_logos/logo_cache_unittest.cc',
             'search_provider_logos/logo_tracker_unittest.cc',
             'sessions/serialized_navigation_entry_unittest.cc',
@@ -337,6 +343,9 @@
             # Dependencies of rappor
             'components.gyp:rappor',
 
+            # Dependencies of search_engines
+            'components.gyp:search_engines',
+
             # Dependencies of search_provider_logos
             'components.gyp:search_provider_logos',
 
@@ -440,6 +449,7 @@
                 ['include', '^network_time/'],
                 ['include', '^password_manager/'],
                 ['include', '^precache/core/'],
+                ['include', '^search_engines/'],
                 ['include', '^search_provider_logos/'],
                 ['include', '^signin/'],
                 ['include', '^sync_driver/'],
@@ -632,6 +642,7 @@
                 'policy/core/common/schema_map_unittest.cc',
                 'policy/core/common/schema_registry_unittest.cc',
                 'policy/core/common/schema_unittest.cc',
+                'search_engines/default_search_policy_handler_unittest.cc',
               ],
               'conditions': [
                 ['OS=="android"', {
diff --git a/chrome/browser/search_engines/default_search_manager_unittest.cc b/components/search_engines/default_search_manager_unittest.cc
index 847be02..847be02 100644
--- a/chrome/browser/search_engines/default_search_manager_unittest.cc
+++ b/components/search_engines/default_search_manager_unittest.cc
diff --git a/chrome/browser/search_engines/default_search_policy_handler_unittest.cc b/components/search_engines/default_search_policy_handler_unittest.cc
index 865a4ed..a79b5a6 100644
--- a/chrome/browser/search_engines/default_search_policy_handler_unittest.cc
+++ b/components/search_engines/default_search_policy_handler_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc b/components/search_engines/search_host_to_urls_map_unittest.cc
index 967166a..f87db78 100644
--- a/chrome/browser/search_engines/search_host_to_urls_map_unittest.cc
+++ b/components/search_engines/search_host_to_urls_map_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc b/components/search_engines/template_url_prepopulate_data_unittest.cc
index 29be928..b1906c3 100644
--- a/chrome/browser/search_engines/template_url_prepopulate_data_unittest.cc
+++ b/components/search_engines/template_url_prepopulate_data_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -14,9 +14,7 @@
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_prepopulate_data.h"
 #include "components/search_engines/template_url_service.h"
-#include "grit/generated_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/l10n/l10n_util.h"
 
 using base::ASCIIToUTF16;
 
diff --git a/chrome/browser/search_engines/template_url_service_util_unittest.cc b/components/search_engines/template_url_service_util_unittest.cc
index 98b39bc..65b992a 100644
--- a/chrome/browser/search_engines/template_url_service_util_unittest.cc
+++ b/components/search_engines/template_url_service_util_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
diff --git a/chrome/browser/search_engines/template_url_unittest.cc b/components/search_engines/template_url_unittest.cc
index 2c3d38b..f591afc 100644
--- a/chrome/browser/search_engines/template_url_unittest.cc
+++ b/components/search_engines/template_url_unittest.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.