Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(958)

Unified Diff: net/base/data_url.cc

Issue 399068: Move base64 from 'net/base' into 'base'. (Closed)
Patch Set: rebase Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/DEPS ('k') | net/base/net_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/data_url.cc
diff --git a/net/base/data_url.cc b/net/base/data_url.cc
index fb7de686b887c2a7ddcc7947036e34c93f9244af..e30f7da1c376a0a84ed3b885e97a067b0a2329f3 100644
--- a/net/base/data_url.cc
+++ b/net/base/data_url.cc
@@ -8,9 +8,9 @@
#include "net/base/data_url.h"
+#include "base/base64.h"
#include "base/string_util.h"
#include "googleurl/src/gurl.h"
-#include "net/base/base64.h"
#include "net/base/escape.h"
namespace net {
@@ -93,7 +93,7 @@ bool DataURL::Parse(const GURL& url, std::string* mime_type,
}
if (base64_encoded)
- return Base64Decode(temp_data, data);
+ return base::Base64Decode(temp_data, data);
temp_data.swap(*data);
return true;
« no previous file with comments | « net/DEPS ('k') | net/base/net_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698