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

Side by Side Diff: webkit/common/database/database_connections_unittest.cc

Issue 102993018: Remove UTF string conversion functions from the global namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: aaaaaaaaaa 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/bind.h" 5 #include "base/bind.h"
6 #include "base/message_loop/message_loop.h" 6 #include "base/message_loop/message_loop.h"
7 #include "base/strings/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "base/threading/thread.h" 8 #include "base/threading/thread.h"
9 #include "testing/gtest/include/gtest/gtest.h" 9 #include "testing/gtest/include/gtest/gtest.h"
10 #include "webkit/common/database/database_connections.h" 10 #include "webkit/common/database/database_connections.h"
11 11
12 using base::ASCIIToWide; 12 using base::ASCIIToUTF16;
13 13
14 namespace webkit_database { 14 namespace webkit_database {
15 15
16 namespace { 16 namespace {
17 17
18 void RemoveConnectionTask( 18 void RemoveConnectionTask(
19 const std::string& origin_id, const base::string16& database_name, 19 const std::string& origin_id, const base::string16& database_name,
20 scoped_refptr<DatabaseConnectionsWrapper> obj, 20 scoped_refptr<DatabaseConnectionsWrapper> obj,
21 bool* did_task_execute) { 21 bool* did_task_execute) {
22 *did_task_execute = true; 22 *did_task_execute = true;
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 base::MessageLoop::current()->PostTask( 136 base::MessageLoop::current()->PostTask(
137 FROM_HERE, 137 FROM_HERE,
138 base::Bind(&ScheduleRemoveConnectionTask, &thread, kOriginId, kName, obj, 138 base::Bind(&ScheduleRemoveConnectionTask, &thread, kOriginId, kName, obj,
139 &did_task_execute)); 139 &did_task_execute));
140 obj->WaitForAllDatabasesToClose(); // should return after the task executes 140 obj->WaitForAllDatabasesToClose(); // should return after the task executes
141 EXPECT_TRUE(did_task_execute); 141 EXPECT_TRUE(did_task_execute);
142 EXPECT_FALSE(obj->HasOpenConnections()); 142 EXPECT_FALSE(obj->HasOpenConnections());
143 } 143 }
144 144
145 } // namespace webkit_database 145 } // namespace webkit_database
OLDNEW
« no previous file with comments | « webkit/child/ftp_directory_listing_response_delegate.cc ('k') | webkit/common/webpreferences.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698