diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:54:58 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-18 16:54:58 +0000 |
| commit | 0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88 (patch) | |
| tree | 34d232d10e6415100d5b660317c23a14e157ba83 /chrome/service | |
| parent | dac096590a0f00f124eb71b12ff6a32cee439fca (diff) | |
| download | chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.zip chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.tar.gz chromium_src-0ad1d2d6eb6f1e4edff72dabb8e2b2f9ba051f88.tar.bz2 | |
base: Put md5.* into base namespace.
BUG=89274
TEST=None
R=evan@chromium.org
Review URL: http://codereview.chromium.org/7395021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
4 files changed, 9 insertions, 9 deletions
diff --git a/chrome/service/cloud_print/cloud_print_helpers.cc b/chrome/service/cloud_print/cloud_print_helpers.cc index f7db653..71bfea7 100644 --- a/chrome/service/cloud_print/cloud_print_helpers.cc +++ b/chrome/service/cloud_print/cloud_print_helpers.cc @@ -218,7 +218,7 @@ std::string CloudPrintHelpers::GenerateHashOfStringMap( values_list.append(it->first); values_list.append(it->second); } - return MD5String(values_list); + return base::MD5String(values_list); } void CloudPrintHelpers::GenerateMultipartPostDataForPrinterTags( @@ -251,7 +251,7 @@ void CloudPrintHelpers::GenerateMultipartPostDataForPrinterTags( AddMultipartValueForUpload(kPrinterTagValue, msg, mime_boundary, std::string(), post_data); } - std::string tags_hash = MD5String(tags_list); + std::string tags_hash = base::MD5String(tags_list); std::string tags_hash_msg(kTagsHashTagName); tags_hash_msg += "="; tags_hash_msg += tags_hash; diff --git a/chrome/service/cloud_print/cloud_print_proxy_backend.cc b/chrome/service/cloud_print/cloud_print_proxy_backend.cc index 92250c8..7e6b3b1 100644 --- a/chrome/service/cloud_print/cloud_print_proxy_backend.cc +++ b/chrome/service/cloud_print/cloud_print_proxy_backend.cc @@ -10,9 +10,9 @@ #include "base/file_util.h" #include "base/md5.h" #include "base/rand_util.h" -#include "base/stringprintf.h" #include "base/string_number_conversions.h" #include "base/string_split.h" +#include "base/stringprintf.h" #include "base/utf_string_conversions.h" #include "base/values.h" #include "chrome/common/net/gaia/gaia_oauth_client.h" @@ -682,7 +682,7 @@ void CloudPrintProxyBackend::Core::OnReceivePrinterCaps( // later to check if the capabilities have changed CloudPrintHelpers::AddMultipartValueForUpload( kPrinterCapsHashValue, - MD5String(last_uploaded_printer_info_.printer_capabilities), + base::MD5String(last_uploaded_printer_info_.printer_capabilities), mime_boundary, std::string(), &post_data); GURL post_url = CloudPrintHelpers::GetUrlForPrinterRegistration( cloud_print_server_url_); diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc index 22ebdfc..3387334 100644 --- a/chrome/service/cloud_print/print_system_cups.cc +++ b/chrome/service/cloud_print/print_system_cups.cc @@ -23,8 +23,8 @@ #include "base/string_number_conversions.h" #include "base/string_util.h" #include "base/task.h" -#include "base/values.h" #include "base/utf_string_conversions.h" +#include "base/values.h" #include "chrome/service/cloud_print/cloud_print_consts.h" #include "chrome/service/cloud_print/cloud_print_helpers.h" #include "googleurl/src/gurl.h" @@ -224,7 +224,7 @@ class PrintServerWatcherCUPS for (size_t i = 0; i < printers.size(); i++) to_hash += printers[i]; - return MD5String(to_hash); + return base::MD5String(to_hash); } scoped_refptr<PrintSystemCUPS> print_system_; @@ -329,7 +329,7 @@ class PrinterWatcherCUPS to_hash += caps.printer_defaults; to_hash += caps.defaults_mime_type; - return MD5String(to_hash); + return base::MD5String(to_hash); } std::string printer_name_; @@ -818,4 +818,3 @@ void PrintSystemCUPS::RunCapsCallback( } } // namespace cloud_print - diff --git a/chrome/service/cloud_print/printer_job_handler.cc b/chrome/service/cloud_print/printer_job_handler.cc index 6c4b50c..0d883d8 100644 --- a/chrome/service/cloud_print/printer_job_handler.cc +++ b/chrome/service/cloud_print/printer_job_handler.cc @@ -194,7 +194,8 @@ void PrinterJobHandler::OnReceivePrinterCaps( CloudPrintHelpers::CreateMimeBoundaryForUpload(&mime_boundary); if (succeeded) { - std::string caps_hash = MD5String(caps_and_defaults.printer_capabilities); + std::string caps_hash = + base::MD5String(caps_and_defaults.printer_capabilities); if (caps_hash != printer_info_cloud_.caps_hash) { // Hashes don't match, we need to upload new capabilities (the defaults // go for free along with the capabilities) |