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

Side by Side Diff: chrome/browser/browsing_data_database_helper_browsertest.cc

Issue 9419033: Move creation of BrowserContext objects that live in content to content, instead of depending on th… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Fix memory leaks in tests Created 8 years, 10 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/bind_helpers.h" 6 #include "base/bind_helpers.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/utf_string_conversions.h" 8 #include "base/utf_string_conversions.h"
9 #include "chrome/browser/browsing_data_database_helper.h" 9 #include "chrome/browser/browsing_data_database_helper.h"
10 #include "chrome/browser/browsing_data_helper_browsertest.h" 10 #include "chrome/browser/browsing_data_helper_browsertest.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/test/base/in_process_browser_test.h" 13 #include "chrome/test/base/in_process_browser_test.h"
14 #include "chrome/test/base/ui_test_utils.h" 14 #include "chrome/test/base/ui_test_utils.h"
15 #include "content/test/test_browser_thread.h" 15 #include "content/test/test_browser_thread.h"
16 16
17 using content::BrowserContext;
17 using content::BrowserThread; 18 using content::BrowserThread;
18 19
19 namespace { 20 namespace {
20 typedef BrowsingDataHelperCallback<BrowsingDataDatabaseHelper::DatabaseInfo> 21 typedef BrowsingDataHelperCallback<BrowsingDataDatabaseHelper::DatabaseInfo>
21 TestCompletionCallback; 22 TestCompletionCallback;
22 23
23 const char kTestIdentifier1[] = "http_www.google.com_0"; 24 const char kTestIdentifier1[] = "http_www.google.com_0";
24 25
25 const char kTestIdentifierExtension[] = 26 const char kTestIdentifierExtension[] =
26 "chrome-extension_behllobkkfkfnphdnhnkndlbkcpglgmj_0"; 27 "chrome-extension_behllobkkfkfnphdnhnkndlbkcpglgmj_0";
27 28
28 class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest { 29 class BrowsingDataDatabaseHelperTest : public InProcessBrowserTest {
29 public: 30 public:
30 virtual void CreateDatabases() { 31 virtual void CreateDatabases() {
31 webkit_database::DatabaseTracker* db_tracker = 32 webkit_database::DatabaseTracker* db_tracker =
32 browser()->profile()->GetDatabaseTracker(); 33 BrowserContext::GetDatabaseTracker(browser()->profile());
33 string16 db_name = ASCIIToUTF16("db"); 34 string16 db_name = ASCIIToUTF16("db");
34 string16 description = ASCIIToUTF16("db_description"); 35 string16 description = ASCIIToUTF16("db_description");
35 int64 size; 36 int64 size;
36 string16 identifier1(UTF8ToUTF16(kTestIdentifier1)); 37 string16 identifier1(UTF8ToUTF16(kTestIdentifier1));
37 db_tracker->DatabaseOpened(identifier1, db_name, description, 1, &size); 38 db_tracker->DatabaseOpened(identifier1, db_name, description, 1, &size);
38 db_tracker->DatabaseClosed(identifier1, db_name); 39 db_tracker->DatabaseClosed(identifier1, db_name);
39 FilePath db_path1 = db_tracker->GetFullDBFilePath(identifier1, db_name); 40 FilePath db_path1 = db_tracker->GetFullDBFilePath(identifier1, db_name);
40 file_util::CreateDirectory(db_path1.DirName()); 41 file_util::CreateDirectory(db_path1.DirName());
41 ASSERT_EQ(0, file_util::WriteFile(db_path1, NULL, 0)); 42 ASSERT_EQ(0, file_util::WriteFile(db_path1, NULL, 0));
42 string16 identifierExtension(UTF8ToUTF16(kTestIdentifierExtension)); 43 string16 identifierExtension(UTF8ToUTF16(kTestIdentifierExtension));
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 base::Unretained(&callback))); 142 base::Unretained(&callback)));
142 143
143 std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result = 144 std::list<BrowsingDataDatabaseHelper::DatabaseInfo> result =
144 callback.result(); 145 callback.result();
145 146
146 ASSERT_EQ(1u, result.size()); 147 ASSERT_EQ(1u, result.size());
147 EXPECT_STREQ(origin_str, result.begin()->origin_identifier.c_str()); 148 EXPECT_STREQ(origin_str, result.begin()->origin_identifier.c_str());
148 EXPECT_STREQ(db, result.begin()->database_name.c_str()); 149 EXPECT_STREQ(db, result.begin()->database_name.c_str());
149 } 150 }
150 } // namespace 151 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/browsing_data_database_helper.cc ('k') | chrome/browser/browsing_data_file_system_helper.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698