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

Side by Side Diff: chrome/browser/value_store/value_store_frontend_unittest.cc

Issue 11413050: chrome/browser: Update calls from RunAllPending() to RunUntilIdle(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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/file_util.h" 5 #include "base/file_util.h"
6 #include "base/files/scoped_temp_dir.h" 6 #include "base/files/scoped_temp_dir.h"
7 #include "base/memory/scoped_ptr.h" 7 #include "base/memory/scoped_ptr.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "chrome/browser/value_store/value_store_frontend.h" 10 #include "chrome/browser/value_store/value_store_frontend.h"
(...skipping 18 matching lines...) Expand all
29 FilePath test_data_dir; 29 FilePath test_data_dir;
30 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir)); 30 ASSERT_TRUE(PathService::Get(chrome::DIR_TEST_DATA, &test_data_dir));
31 FilePath src_db(test_data_dir.AppendASCII("value_store_db")); 31 FilePath src_db(test_data_dir.AppendASCII("value_store_db"));
32 db_path_ = temp_dir_.path().AppendASCII("temp_db"); 32 db_path_ = temp_dir_.path().AppendASCII("temp_db");
33 file_util::CopyDirectory(src_db, db_path_, true); 33 file_util::CopyDirectory(src_db, db_path_, true);
34 34
35 ResetStorage(); 35 ResetStorage();
36 } 36 }
37 37
38 virtual void TearDown() { 38 virtual void TearDown() {
39 MessageLoop::current()->RunAllPending(); // wait for storage to delete 39 MessageLoop::current()->RunUntilIdle(); // wait for storage to delete
40 storage_.reset(); 40 storage_.reset();
41 } 41 }
42 42
43 // Reset the value store, reloading the DB from disk. 43 // Reset the value store, reloading the DB from disk.
44 void ResetStorage() { 44 void ResetStorage() {
45 storage_.reset(new ValueStoreFrontend(db_path_)); 45 storage_.reset(new ValueStoreFrontend(db_path_));
46 } 46 }
47 47
48 bool Get(const std::string& key, scoped_ptr<base::Value>* output) { 48 bool Get(const std::string& key, scoped_ptr<base::Value>* output) {
49 storage_->Get(key, base::Bind(&ValueStoreFrontendTest::GetAndWait, 49 storage_->Get(key, base::Bind(&ValueStoreFrontendTest::GetAndWait,
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 107
108 { 108 {
109 ASSERT_TRUE(Get("key1", &value)); 109 ASSERT_TRUE(Get("key1", &value));
110 std::string result; 110 std::string result;
111 ASSERT_TRUE(value->GetAsString(&result)); 111 ASSERT_TRUE(value->GetAsString(&result));
112 EXPECT_EQ("new1", result); 112 EXPECT_EQ("new1", result);
113 } 113 }
114 114
115 ASSERT_FALSE(Get("key2", &value)); 115 ASSERT_FALSE(Get("key2", &value));
116 } 116 }
OLDNEW
« no previous file with comments | « chrome/browser/user_style_sheet_watcher_unittest.cc ('k') | chrome/browser/webdata/web_data_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698