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

chrome/browser/safe_browsing/download_protection_service_unittest.cc

 // Copyright (c) 2012 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.
 
 #include "chrome/browser/safe_browsing/download_protection_service.h"
 
 #include <stdint.h>
 #include <map>
 #include <string>
 
@@ skipping 184 matching lines @@
 }
 
 ACTION_P(CheckDownloadUrlDone, threat_type) {
   // TODO(nparker): Remove use of SafeBrowsingCheck and instead call
   // client->OnCheckDownloadUrlResult(..) directly.
   LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck* check =
       new LocalSafeBrowsingDatabaseManager::SafeBrowsingCheck(
           arg0,
           std::vector<SBFullHash>(),
           arg1,
-          safe_browsing::BINURL,
+          safe_browsing_util::BINURL,
           std::vector<SBThreatType>(1, SB_THREAT_TYPE_BINARY_MALWARE_URL));
   for (size_t i = 0; i < check->url_results.size(); ++i)
     check->url_results[i] = threat_type;
   BrowserThread::PostTask(BrowserThread::IO,
                           FROM_HERE,
                           base::Bind(&OnSafeBrowsingResult,
                                      base::Owned(check)));
 }
 
 class DownloadProtectionServiceTest : public testing::Test {
@@ skipping 1736 matching lines @@
 
   EXPECT_CALL(mock_download_item, GetDangerType())
       .WillOnce(Return(content::DOWNLOAD_DANGER_TYPE_DANGEROUS_HOST));
   EXPECT_CALL(mock_page_navigator, OpenURL(OpenURLParamsWithContextValue("7")));
 
   download_service_->ShowDetailsForDownload(mock_download_item,
                                             &mock_page_navigator);
 }
 
 }  // namespace safe_browsing