Move crypto files out of base, to a top level directory.

chrome/renderer/safe_browsing/phishing_term_feature_extractor.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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/renderer/safe_browsing/phishing_term_feature_extractor.h"
 
 #include <list>
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/sha2.h"
 #include "base/metrics/histogram.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
+#include "crypto/sha2.h"
 #include "chrome/renderer/safe_browsing/feature_extractor_clock.h"
 #include "chrome/renderer/safe_browsing/features.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "unicode/ubrk.h"
 
 namespace safe_browsing {
 
 // This time should be short enough that it doesn't noticeably disrupt the
 // user's interaction with the page.
 const int PhishingTermFeatureExtractor::kMaxTimePerChunkMs = 20;
@@ skipping 166 matching lines @@
         return;
       }
       // Otherwise, continue.
     }
   }
   RunCallback(true);
 }
 
 void PhishingTermFeatureExtractor::HandleWord(const string16& word) {
   std::string word_lower = UTF16ToUTF8(l10n_util::ToLower(word));
-  std::string word_hash = base::SHA256HashString(word_lower);
+  std::string word_hash = crypto::SHA256HashString(word_lower);
 
   // Quick out if the word is not part of any term, which is the common case.
   if (page_word_hashes_->find(word_hash) == page_word_hashes_->end()) {
     // Word doesn't exist in our terms so we can clear the n-gram state.
     state_->previous_words.clear();
     state_->previous_word_sizes.clear();
     return;
   }
 
   // Find all of the n-grams that we need to check and compute their hashes.
@@ skipping 13 matching lines @@
   //  - We could include positional information about words in the n-grams,
   //    rather than just a list of all of the words.  For example, we could
   //    change the term format so that each word is hashed separately, or
   //    we could add extra data to the word list to indicate the position
   //    at which the word appears in an n-gram, and skip checking the word if
   //    it's not at that position.
   state_->previous_words.append(word_lower);
   std::string current_term = state_->previous_words;
   for (std::list<size_t>::iterator it = state_->previous_word_sizes.begin();
        it != state_->previous_word_sizes.end(); ++it) {
-    hashes_to_check[base::SHA256HashString(current_term)] = current_term;
+    hashes_to_check[crypto::SHA256HashString(current_term)] = current_term;
     current_term.erase(0, *it);
   }
 
   // Add features for any hashes that match page_term_hashes_.
   for (std::map<std::string, std::string>::iterator it =
            hashes_to_check.begin();
        it != hashes_to_check.end(); ++it) {
     if (page_term_hashes_->find(it->first) != page_term_hashes_->end()) {
       features_->AddBooleanFeature(features::kPageTerm + it->second);
     }
@@ skipping 38 matching lines @@
 }
 
 void PhishingTermFeatureExtractor::Clear() {
   page_text_ = NULL;
   features_ = NULL;
   done_callback_.reset(NULL);
   state_.reset(NULL);
 }
 
 }  // namespace safe_browsing