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

Side by Side Diff: chrome/browser/browsing_data/browsing_data_local_storage_helper_browsertest.cc

Issue 10822030: Move ui_test_utils::RunMessageLoop to test_utils so that it can be reused by content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 8 years, 5 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 <string> 5 #include <string>
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "base/callback.h" 10 #include "base/callback.h"
(...skipping 100 matching lines...) Expand 10 before | Expand all | Expand 10 after
111 111
112 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CallbackCompletes) { 112 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, CallbackCompletes) {
113 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper( 113 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper(
114 new BrowsingDataLocalStorageHelper(browser()->profile())); 114 new BrowsingDataLocalStorageHelper(browser()->profile()));
115 CreateLocalStorageFilesForTest(); 115 CreateLocalStorageFilesForTest();
116 StopTestOnCallback stop_test_on_callback(local_storage_helper); 116 StopTestOnCallback stop_test_on_callback(local_storage_helper);
117 local_storage_helper->StartFetching( 117 local_storage_helper->StartFetching(
118 base::Bind(&StopTestOnCallback::Callback, 118 base::Bind(&StopTestOnCallback::Callback,
119 base::Unretained(&stop_test_on_callback))); 119 base::Unretained(&stop_test_on_callback)));
120 // Blocks until StopTestOnCallback::Callback is notified. 120 // Blocks until StopTestOnCallback::Callback is notified.
121 ui_test_utils::RunMessageLoop(); 121 content::RunMessageLoop();
122 } 122 }
123 123
124 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) { 124 IN_PROC_BROWSER_TEST_F(BrowsingDataLocalStorageHelperTest, DeleteSingleFile) {
125 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper( 125 scoped_refptr<BrowsingDataLocalStorageHelper> local_storage_helper(
126 new BrowsingDataLocalStorageHelper(browser()->profile())); 126 new BrowsingDataLocalStorageHelper(browser()->profile()));
127 CreateLocalStorageFilesForTest(); 127 CreateLocalStorageFilesForTest();
128 local_storage_helper->DeleteOrigin(GURL(kOriginOfTestFile0)); 128 local_storage_helper->DeleteOrigin(GURL(kOriginOfTestFile0));
129 BrowserThread::GetBlockingPool()->FlushForTesting(); 129 BrowserThread::GetBlockingPool()->FlushForTesting();
130 130
131 // Ensure the file has been deleted. 131 // Ensure the file has been deleted.
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 base::Bind(&TestCompletionCallback::callback, 182 base::Bind(&TestCompletionCallback::callback,
183 base::Unretained(&callback))); 183 base::Unretained(&callback)));
184 184
185 std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result = 185 std::list<BrowsingDataLocalStorageHelper::LocalStorageInfo> result =
186 callback.result(); 186 callback.result();
187 187
188 ASSERT_EQ(1u, result.size()); 188 ASSERT_EQ(1u, result.size());
189 EXPECT_EQ(origin, result.begin()->origin_url); 189 EXPECT_EQ(origin, result.begin()->origin_url);
190 } 190 }
191 } // namespace 191 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698