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

Side by Side Diff: content/browser/frame_host/navigation_entry_impl_unittest.cc

Issue 121033002: Update uses of UTF conversions in content/ to use the base:: namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 12 months 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/string16.h" 5 #include "base/strings/string16.h"
6 #include "base/strings/string_util.h" 6 #include "base/strings/string_util.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/time/time.h" 8 #include "base/time/time.h"
9 #include "content/browser/frame_host/navigation_entry_impl.h" 9 #include "content/browser/frame_host/navigation_entry_impl.h"
10 #include "content/browser/site_instance_impl.h" 10 #include "content/browser/site_instance_impl.h"
11 #include "content/public/common/ssl_status.h" 11 #include "content/public/common/ssl_status.h"
12 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
13 13
14 using base::ASCIIToUTF16;
15
14 namespace content { 16 namespace content {
15 17
16 class NavigationEntryTest : public testing::Test { 18 class NavigationEntryTest : public testing::Test {
17 public: 19 public:
18 NavigationEntryTest() : instance_(NULL) { 20 NavigationEntryTest() : instance_(NULL) {
19 } 21 }
20 22
21 virtual void SetUp() { 23 virtual void SetUp() {
22 entry1_.reset(new NavigationEntryImpl); 24 entry1_.reset(new NavigationEntryImpl);
23 25
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 // Content in |output| is not modified if data is not present at the key. 234 // Content in |output| is not modified if data is not present at the key.
233 EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output)); 235 EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output));
234 EXPECT_EQ(test_data, output); 236 EXPECT_EQ(test_data, output);
235 // Using an empty string shows that the data is not present in the map. 237 // Using an empty string shows that the data is not present in the map.
236 base::string16 output2; 238 base::string16 output2;
237 EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output2)); 239 EXPECT_FALSE(entry1_->GetExtraData("search_terms", &output2));
238 EXPECT_EQ(ASCIIToUTF16(""), output2); 240 EXPECT_EQ(ASCIIToUTF16(""), output2);
239 } 241 }
240 242
241 } // namespace content 243 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698