Revert of Move more declarations from c/b/sb/sb_util.h to components.

components/components_tests.gyp

 # 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.
 
 {
   'variables': {
     # This turns on e.g. the filename-based detection of which
     # platforms to include source files on (e.g. files ending in
     # _mac.h or _mac.cc are only compiled on MacOSX).
     'chromium_code': 1,
@@ skipping 559 matching lines @@
       'rappor/rappor_prefs_unittest.cc',
       'rappor/rappor_service_unittest.cc',
       'rappor/rappor_utils_unittest.cc',
       'rappor/sampler_unittest.cc',
     ],
     'rlz_unittest_sources': [
       'rlz/rlz_tracker_unittest.cc',
     ],
     'safe_browsing_db_unittest_sources': [
       'safe_browsing_db/prefix_set_unittest.cc',
-      'safe_browsing_db/util_unittest.cc',
+      'safe_browsing_db/safe_browsing_db_util_unittest.cc',
     ],
     'safe_json_unittest_sources': [
       'safe_json/json_sanitizer_unittest.cc',
     ],
     'scheduler_unittest_sources': [
       'scheduler/base/nestable_task_runner_for_test.cc',
       'scheduler/base/nestable_task_runner_for_test.h',
       'scheduler/base/task_queue_manager_unittest.cc',
       'scheduler/base/task_queue_selector_unittest.cc',
       'scheduler/base/task_queue_sets_unittest.cc',
@@ skipping 1213 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],
 }