summaryrefslogtreecommitdiffstats
path: root/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 22:50:07 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-12-04 22:50:07 +0000
commit12469f90e2decfa5bdd9e43a812a01ded039f296 (patch)
treeb4aad9431ea0023b818c30cab01f9e31fe21cce0 /chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
parentc0d50816026776361ba9d69542b880fef4df0ccf (diff)
downloadchromium_src-12469f90e2decfa5bdd9e43a812a01ded039f296.zip
chromium_src-12469f90e2decfa5bdd9e43a812a01ded039f296.tar.gz
chromium_src-12469f90e2decfa5bdd9e43a812a01ded039f296.tar.bz2
Use base namespace for string16 in chrome/renderer.
TBR=sky Review URL: https://codereview.chromium.org/105493002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc')
-rw-r--r--chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
index 22413de..4acb129 100644
--- a/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
+++ b/chrome/renderer/safe_browsing/phishing_classifier_browsertest.cc
@@ -103,7 +103,7 @@ class PhishingClassifierTest : public InProcessBrowserTest {
// Helper method to start phishing classification and wait for it to
// complete. Returns the true if the page is classified as phishy and
// false otherwise.
- bool RunPhishingClassifier(const string16* page_text,
+ bool RunPhishingClassifier(const base::string16* page_text,
float* phishy_score,
FeatureMap* features) {
ClientPhishingRequest verdict;
@@ -115,7 +115,7 @@ class PhishingClassifierTest : public InProcessBrowserTest {
return verdict.is_phishing();
}
- void DoRunPhishingClassifier(const string16* page_text,
+ void DoRunPhishingClassifier(const base::string16* page_text,
float* phishy_score,
FeatureMap* features,
ClientPhishingRequest* verdict) {
@@ -218,7 +218,7 @@ IN_PROC_BROWSER_TEST_F(PhishingClassifierTest, MAYBE_TestClassification) {
EXPECT_CALL(*clock_, Now())
.WillRepeatedly(::testing::Return(base::TimeTicks::Now()));
- string16 page_text = ASCIIToUTF16("login");
+ base::string16 page_text = ASCIIToUTF16("login");
float phishy_score;
FeatureMap features;