Added completion notification to Profile's ClearNetworkingHistorySince.

chrome/browser/net/http_server_properties_manager_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/net/http_server_properties_manager.h"
 
 #include "base/basictypes.h"
 #include "base/message_loop.h"
 #include "base/values.h"
 #include "chrome/common/pref_names.h"
@@ skipping 36 matching lines @@
   void UpdateCacheFromPrefsOnUIConcrete() {
     HttpServerPropertiesManager::UpdateCacheFromPrefsOnUI();
   }
 
   // Post tasks without a delay during tests.
   virtual void StartCacheUpdateTimerOnUI(base::TimeDelta delay) OVERRIDE {
     HttpServerPropertiesManager::StartCacheUpdateTimerOnUI(
         base::TimeDelta());
   }
 
-  void UpdatePrefsFromCacheOnIOConcrete() {
-    HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO();
+  void UpdatePrefsFromCacheOnIOConcrete(const base::Closure& callback) {
+    HttpServerPropertiesManager::UpdatePrefsFromCacheOnIO(callback);
   }
 
   MOCK_METHOD0(UpdateCacheFromPrefsOnUI, void());
-  MOCK_METHOD0(UpdatePrefsFromCacheOnIO, void());
+  MOCK_METHOD1(UpdatePrefsFromCacheOnIO, void(const base::Closure&));
   MOCK_METHOD5(UpdateCacheFromPrefsOnIO,
                void(std::vector<std::string>* spdy_servers,
                     net::SpdySettingsMap* spdy_settings_map,
                     net::AlternateProtocolMap* alternate_protocol_map,
                     net::PipelineCapabilityMap* pipeline_capability_map,
                     bool detected_corrupted_prefs));
   MOCK_METHOD4(UpdatePrefsOnUI,
                void(base::ListValue* spdy_server_list,
                     net::SpdySettingsMap* spdy_settings_map,
                     net::AlternateProtocolMap* alternate_protocol_map,
                     net::PipelineCapabilityMap* pipeline_capability_map));
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestingHttpServerPropertiesManager);
 };
 
+class MockClosure : public base::RefCountedThreadSafe<MockClosure> {

[battre, 2012/10/23 08:38:33]

I think this is quite some complexity given that this is used only once.

What do you (and the other reviewers) think of:

- Moving this to chrome/test/base? (my preferred solution), or

- Adding a
    MOCK_METHOD0(MockCallback, void())
  to the test fixture,
  and then adding
    EXPECT_CALL(*this, MockCallback());
    http_server_props_manager_->Clear(
        base::Bind(HttpServerPropertiesManagerTest::MockCallback,
Unretained(this)));

[engedy, 2012/10/23 10:40:09]

Will, Raman, what do you think?

On 2012/10/23 08:38:33, battre wrote:

[ramant (doing other things), 2012/10/23 23:51:48]

+1 to moving it to chrome/test/base.

In this file, we had used approach#2 (IMO, it is easy slightly easier to
understand). Don't have objections with either approach.

thanks for doing this.

On 2012/10/23 08:38:33, battre wrote:

+ public:
+  MOCK_METHOD0(MockMethod, void());
+
+  static base::Closure NewExpectedClosure() {
+    scoped_refptr<MockClosure> mock_closure(new MockClosure);
+    EXPECT_CALL(*mock_closure, MockMethod());
+    return base::Bind(&MockClosure::MockMethod, mock_closure);
+  }
+
+ protected:
+  friend class base::RefCountedThreadSafe<MockClosure>;
+  virtual ~MockClosure() {}
+
+ private:
+  MockClosure() {}
+  DISALLOW_COPY_AND_ASSIGN(MockClosure);
+};
+
 class HttpServerPropertiesManagerTest : public testing::Test {
  protected:
   HttpServerPropertiesManagerTest()
       : ui_thread_(BrowserThread::UI, &loop_),
         io_thread_(BrowserThread::IO, &loop_) {
   }
 
   virtual void SetUp() OVERRIDE {
     pref_service_.RegisterDictionaryPref(prefs::kHttpServerProperties);
     http_server_props_manager_.reset(
@@ skipping 13 matching lines @@
 
   void ExpectCacheUpdate() {
     EXPECT_CALL(*http_server_props_manager_, UpdateCacheFromPrefsOnUI())
         .WillOnce(
             Invoke(http_server_props_manager_.get(),
                    &TestingHttpServerPropertiesManager::
                    UpdateCacheFromPrefsOnUIConcrete));
   }
 
   void ExpectPrefsUpdate() {
-    EXPECT_CALL(*http_server_props_manager_, UpdatePrefsFromCacheOnIO())
+    EXPECT_CALL(*http_server_props_manager_, UpdatePrefsFromCacheOnIO(_))
         .WillOnce(
             Invoke(http_server_props_manager_.get(),
                    &TestingHttpServerPropertiesManager::
                    UpdatePrefsFromCacheOnIOConcrete));
   }
 
   MessageLoop loop_;
   TestingPrefService pref_service_;
   scoped_ptr<TestingHttpServerPropertiesManager> http_server_props_manager_;
 
@@ skipping 223 matching lines @@
   net::SettingsFlagsAndValue flags_and_value1_ret = it1_ret->second;
   EXPECT_EQ(net::SETTINGS_FLAG_PERSISTED, flags_and_value1_ret.first);
   EXPECT_EQ(value1, flags_and_value1_ret.second);
 
   EXPECT_EQ(net::PIPELINE_CAPABLE,
             http_server_props_manager_->GetPipelineCapability(known_pipeliner));
 
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
 
   ExpectPrefsUpdate();
+
   // Clear http server data.
-  http_server_props_manager_->Clear();
+  http_server_props_manager_->Clear(MockClosure::NewExpectedClosure());
 
   // Run the task.
   loop_.RunAllPending();
 
   EXPECT_FALSE(http_server_props_manager_->SupportsSpdy(spdy_server_mail));
   EXPECT_FALSE(
       http_server_props_manager_->HasAlternateProtocol(spdy_server_mail));
 
   const net::SettingsMap& settings_map2_ret =
       http_server_props_manager_->GetSpdySettings(spdy_server_mail);
@@ skipping 59 matching lines @@
   http_server_props_manager_->ShutdownOnUIThread();
   // Run the task after shutdown, but before deletion.
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   loop_.RunAllPending();
 }
 
 TEST_F(HttpServerPropertiesManagerTest, ShutdownWithPendingUpdatePrefs2) {
   // This posts a task to the UI thread.
-  http_server_props_manager_->UpdatePrefsFromCacheOnIOConcrete();
+  http_server_props_manager_->UpdatePrefsFromCacheOnIOConcrete(base::Closure());
   // Shutdown comes before the task is executed.
   http_server_props_manager_->ShutdownOnUIThread();
   // Run the task after shutdown, but before deletion.
   loop_.RunAllPending();
   Mock::VerifyAndClearExpectations(http_server_props_manager_.get());
   http_server_props_manager_.reset();
   loop_.RunAllPending();
 }
 
 }  // namespace
 
 }  // namespace chrome_browser_net