summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authorsuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 02:40:46 +0000
committersuzhe@google.com <suzhe@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-28 02:40:46 +0000
commit39a749c1cc998edcd66edfc3ffc9004710825f46 (patch)
tree370b1a18564e743cfbfc16beb4d0053437064486 /chrome
parent911696b92b1b5a666e59433b8b64303a2f4eae62 (diff)
downloadchromium_src-39a749c1cc998edcd66edfc3ffc9004710825f46.zip
chromium_src-39a749c1cc998edcd66edfc3ffc9004710825f46.tar.gz
chromium_src-39a749c1cc998edcd66edfc3ffc9004710825f46.tar.bz2
Change UTF8ToUTF16 to accept const StringPiece&.
BUG=70936 TEST=All unit tests should pass. Review URL: http://codereview.chromium.org/6317016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72921 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/browser/autofill/form_group.cc2
-rw-r--r--chrome/browser/extensions/default_apps.cc2
-rw-r--r--chrome/browser/safe_browsing/chunk_range.cc2
-rw-r--r--chrome/browser/safe_browsing/filter_false_positive_perftest.cc2
-rw-r--r--chrome/browser/safe_browsing/protocol_parser.cc2
-rw-r--r--chrome/common/service_process_util.cc3
-rw-r--r--chrome/installer/util/l10n_string_util.cc2
-rw-r--r--chrome/renderer/localized_error.cc2
-rw-r--r--chrome/test/mini_installer_test/mini_installer_test_util.cc2
9 files changed, 16 insertions, 3 deletions
diff --git a/chrome/browser/autofill/form_group.cc b/chrome/browser/autofill/form_group.cc
index 49beb16..6c53303 100644
--- a/chrome/browser/autofill/form_group.cc
+++ b/chrome/browser/autofill/form_group.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "chrome/browser/autofill/form_group.h"
string16 FormGroup::GetPreviewText(const AutoFillType& type) const {
diff --git a/chrome/browser/extensions/default_apps.cc b/chrome/browser/extensions/default_apps.cc
index cee5c32..bf8aa9a 100644
--- a/chrome/browser/extensions/default_apps.cc
+++ b/chrome/browser/extensions/default_apps.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "chrome/browser/extensions/default_apps.h"
#include "base/command_line.h"
diff --git a/chrome/browser/safe_browsing/chunk_range.cc b/chrome/browser/safe_browsing/chunk_range.cc
index b2f60ba..f389342 100644
--- a/chrome/browser/safe_browsing/chunk_range.cc
+++ b/chrome/browser/safe_browsing/chunk_range.cc
@@ -4,6 +4,8 @@
//
// Implementation of ChunkRange class.
+#include <algorithm>
+
#include "chrome/browser/safe_browsing/chunk_range.h"
#include "base/logging.h"
diff --git a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc
index eec1c2e..34c4512 100644
--- a/chrome/browser/safe_browsing/filter_false_positive_perftest.cc
+++ b/chrome/browser/safe_browsing/filter_false_positive_perftest.cc
@@ -52,6 +52,7 @@
// <url>,<weight> where weight is an integer indicating the number of
// unique views for the URL.
+#include <algorithm>
#include <fstream>
#include <vector>
@@ -380,4 +381,3 @@ TEST(SafeBrowsingBloomFilter, HashTime) {
<< ", per-check (us): " << time_per_check
<< std::endl;
}
-
diff --git a/chrome/browser/safe_browsing/protocol_parser.cc b/chrome/browser/safe_browsing/protocol_parser.cc
index c8d1691..08e521e 100644
--- a/chrome/browser/safe_browsing/protocol_parser.cc
+++ b/chrome/browser/safe_browsing/protocol_parser.cc
@@ -4,6 +4,8 @@
//
// Parse the data returned from the SafeBrowsing v2.1 protocol response.
+#include <stdlib.h>
+
#include "chrome/browser/safe_browsing/protocol_parser.h"
#include "chrome/browser/safe_browsing/safe_browsing_util.h"
diff --git a/chrome/common/service_process_util.cc b/chrome/common/service_process_util.cc
index bcbac69..4062e0f 100644
--- a/chrome/common/service_process_util.cc
+++ b/chrome/common/service_process_util.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "base/file_util.h"
#include "base/logging.h"
#include "base/path_service.h"
@@ -237,4 +239,3 @@ bool ServiceProcessState::CreateSharedData() {
std::string ServiceProcessState::GetAutoRunKey() {
return GetServiceProcessScopedName("_service_run");
}
-
diff --git a/chrome/installer/util/l10n_string_util.cc b/chrome/installer/util/l10n_string_util.cc
index b8429a8..94aaaff 100644
--- a/chrome/installer/util/l10n_string_util.cc
+++ b/chrome/installer/util/l10n_string_util.cc
@@ -5,6 +5,8 @@
// This file defines specific implementation of BrowserDistribution class for
// Google Chrome.
+#include <algorithm>
+
#include <atlbase.h>
#include "base/logging.h"
diff --git a/chrome/renderer/localized_error.cc b/chrome/renderer/localized_error.cc
index 7b4ae31..8821267 100644
--- a/chrome/renderer/localized_error.cc
+++ b/chrome/renderer/localized_error.cc
@@ -355,7 +355,7 @@ void LocalizedError::GetStrings(const WebKit::WebURLError& error,
l10n_util::GetStringUTF16(IDS_ERRORPAGES_SUGGESTION_HEADING));
}
- string16 failed_url(ASCIIToUTF16(error.unreachableURL.spec()));
+ string16 failed_url(ASCIIToUTF16(std::string(error.unreachableURL.spec())));
// URLs are always LTR.
if (rtl)
base::i18n::WrapStringWithLTRFormatting(&failed_url);
diff --git a/chrome/test/mini_installer_test/mini_installer_test_util.cc b/chrome/test/mini_installer_test/mini_installer_test_util.cc
index 2df756f..c73139d 100644
--- a/chrome/test/mini_installer_test/mini_installer_test_util.cc
+++ b/chrome/test/mini_installer_test/mini_installer_test_util.cc
@@ -2,6 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include <algorithm>
+
#include "chrome/test/mini_installer_test/mini_installer_test_util.h"
#include "base/file_path.h"