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

Side by Side Diff: content/browser/dom_storage/dom_storage_area_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/bind.h" 5 #include "base/bind.h"
6 #include "base/file_util.h" 6 #include "base/file_util.h"
7 #include "base/files/scoped_temp_dir.h" 7 #include "base/files/scoped_temp_dir.h"
8 #include "base/message_loop/message_loop.h" 8 #include "base/message_loop/message_loop.h"
9 #include "base/message_loop/message_loop_proxy.h" 9 #include "base/message_loop/message_loop_proxy.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/threading/sequenced_worker_pool.h" 11 #include "base/threading/sequenced_worker_pool.h"
12 #include "base/time/time.h" 12 #include "base/time/time.h"
13 #include "content/browser/dom_storage/dom_storage_area.h" 13 #include "content/browser/dom_storage/dom_storage_area.h"
14 #include "content/browser/dom_storage/dom_storage_database.h" 14 #include "content/browser/dom_storage/dom_storage_database.h"
15 #include "content/browser/dom_storage/dom_storage_database_adapter.h" 15 #include "content/browser/dom_storage/dom_storage_database_adapter.h"
16 #include "content/browser/dom_storage/dom_storage_task_runner.h" 16 #include "content/browser/dom_storage/dom_storage_task_runner.h"
17 #include "content/browser/dom_storage/local_storage_database_adapter.h" 17 #include "content/browser/dom_storage/local_storage_database_adapter.h"
18 #include "content/common/dom_storage/dom_storage_types.h" 18 #include "content/common/dom_storage/dom_storage_types.h"
19 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
20 20
21 using base::ASCIIToUTF16;
22
21 namespace content { 23 namespace content {
22 24
23
24 class DOMStorageAreaTest : public testing::Test { 25 class DOMStorageAreaTest : public testing::Test {
25 public: 26 public:
26 DOMStorageAreaTest() 27 DOMStorageAreaTest()
27 : kOrigin(GURL("http://dom_storage/")), 28 : kOrigin(GURL("http://dom_storage/")),
28 kKey(ASCIIToUTF16("key")), 29 kKey(ASCIIToUTF16("key")),
29 kValue(ASCIIToUTF16("value")), 30 kValue(ASCIIToUTF16("value")),
30 kKey2(ASCIIToUTF16("key2")), 31 kKey2(ASCIIToUTF16("key2")),
31 kValue2(ASCIIToUTF16("value2")) { 32 kValue2(ASCIIToUTF16("value2")) {
32 } 33 }
33 34
(...skipping 431 matching lines...) Expand 10 before | Expand all | Expand 10 after
465 EXPECT_EQ( 466 EXPECT_EQ(
466 base::FilePath().AppendASCII("-journal"), 467 base::FilePath().AppendASCII("-journal"),
467 DOMStorageDatabase::GetJournalFilePath(base::FilePath())); 468 DOMStorageDatabase::GetJournalFilePath(base::FilePath()));
468 EXPECT_EQ( 469 EXPECT_EQ(
469 base::FilePath().AppendASCII(".extensiononly-journal"), 470 base::FilePath().AppendASCII(".extensiononly-journal"),
470 DOMStorageDatabase::GetJournalFilePath( 471 DOMStorageDatabase::GetJournalFilePath(
471 base::FilePath().AppendASCII(".extensiononly"))); 472 base::FilePath().AppendASCII(".extensiononly")));
472 } 473 }
473 474
474 } // namespace content 475 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698