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

Side by Side Diff: content/browser/dom_storage/dom_storage_database_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 "content/browser/dom_storage/dom_storage_database.h" 5 #include "content/browser/dom_storage/dom_storage_database.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/files/scoped_temp_dir.h" 9 #include "base/files/scoped_temp_dir.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/strings/utf_string_conversions.h" 11 #include "base/strings/utf_string_conversions.h"
12 #include "sql/statement.h" 12 #include "sql/statement.h"
13 #include "sql/test/scoped_error_ignorer.h" 13 #include "sql/test/scoped_error_ignorer.h"
14 #include "testing/gtest/include/gtest/gtest.h" 14 #include "testing/gtest/include/gtest/gtest.h"
15 #include "third_party/sqlite/sqlite3.h" 15 #include "third_party/sqlite/sqlite3.h"
16 16
17 using base::ASCIIToUTF16;
18
17 namespace content { 19 namespace content {
18 20
19 void CreateV1Table(sql::Connection* db) { 21 void CreateV1Table(sql::Connection* db) {
20 ASSERT_TRUE(db->is_open()); 22 ASSERT_TRUE(db->is_open());
21 ASSERT_TRUE(db->Execute("DROP TABLE IF EXISTS ItemTable")); 23 ASSERT_TRUE(db->Execute("DROP TABLE IF EXISTS ItemTable"));
22 ASSERT_TRUE(db->Execute( 24 ASSERT_TRUE(db->Execute(
23 "CREATE TABLE ItemTable (" 25 "CREATE TABLE ItemTable ("
24 "key TEXT UNIQUE ON CONFLICT REPLACE, " 26 "key TEXT UNIQUE ON CONFLICT REPLACE, "
25 "value TEXT NOT NULL ON CONFLICT FAIL)")); 27 "value TEXT NOT NULL ON CONFLICT FAIL)"));
26 } 28 }
(...skipping 357 matching lines...) Expand 10 before | Expand all | Expand 10 after
384 EXPECT_EQ(0u, values.size()); 386 EXPECT_EQ(0u, values.size());
385 EXPECT_FALSE(db.IsOpen()); 387 EXPECT_FALSE(db.IsOpen());
386 388
387 EXPECT_TRUE(base::PathExists(temp_dir.path())); 389 EXPECT_TRUE(base::PathExists(temp_dir.path()));
388 390
389 ASSERT_TRUE(ignore_errors.CheckIgnoredErrors()); 391 ASSERT_TRUE(ignore_errors.CheckIgnoredErrors());
390 } 392 }
391 } 393 }
392 394
393 } // namespace content 395 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698