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

Side by Side Diff: chrome/browser/net/http_server_properties_manager_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 7 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 "chrome/browser/net/http_server_properties_manager.h" 5 #include "chrome/browser/net/http_server_properties_manager.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/message_loop.h" 8 #include "base/message_loop.h"
9 #include "base/values.h" 9 #include "base/values.h"
10 #include "chrome/common/pref_names.h" 10 #include "chrome/common/pref_names.h"
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
110 110
111 void ExpectPrefsUpdate() { 111 void ExpectPrefsUpdate() {
112 EXPECT_CALL(*http_server_props_manager_, UpdatePrefsFromCacheOnIO(_)) 112 EXPECT_CALL(*http_server_props_manager_, UpdatePrefsFromCacheOnIO(_))
113 .WillOnce( 113 .WillOnce(
114 Invoke(http_server_props_manager_.get(), 114 Invoke(http_server_props_manager_.get(),
115 &TestingHttpServerPropertiesManager:: 115 &TestingHttpServerPropertiesManager::
116 UpdatePrefsFromCacheOnIOConcrete)); 116 UpdatePrefsFromCacheOnIOConcrete));
117 } 117 }
118 118
119 MessageLoop loop_; 119 MessageLoop loop_;
120 TestingPrefService pref_service_; 120 TestingPrefServiceSimple pref_service_;
121 scoped_ptr<TestingHttpServerPropertiesManager> http_server_props_manager_; 121 scoped_ptr<TestingHttpServerPropertiesManager> http_server_props_manager_;
122 122
123 private: 123 private:
124 content::TestBrowserThread ui_thread_; 124 content::TestBrowserThread ui_thread_;
125 content::TestBrowserThread io_thread_; 125 content::TestBrowserThread io_thread_;
126 126
127 DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManagerTest); 127 DISALLOW_COPY_AND_ASSIGN(HttpServerPropertiesManagerTest);
128 }; 128 };
129 129
130 TEST_F(HttpServerPropertiesManagerTest, 130 TEST_F(HttpServerPropertiesManagerTest,
(...skipping 308 matching lines...) Expand 10 before | Expand all | Expand 10 after
439 // Run the task after shutdown, but before deletion. 439 // Run the task after shutdown, but before deletion.
440 loop_.RunUntilIdle(); 440 loop_.RunUntilIdle();
441 Mock::VerifyAndClearExpectations(http_server_props_manager_.get()); 441 Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
442 http_server_props_manager_.reset(); 442 http_server_props_manager_.reset();
443 loop_.RunUntilIdle(); 443 loop_.RunUntilIdle();
444 } 444 }
445 445
446 } // namespace 446 } // namespace
447 447
448 } // namespace chrome_browser_net 448 } // namespace chrome_browser_net
OLDNEW
« no previous file with comments | « chrome/browser/net/http_server_properties_manager.cc ('k') | chrome/browser/net/net_pref_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698