Remove NOTIFICATION_HISTORY_URLS_DELETED

chrome/browser/autocomplete/history_quick_provider_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/autocomplete/history_quick_provider.h"
 
 #include <algorithm>
 #include <functional>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/format_macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
 #include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
-#include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/history/in_memory_url_index.h"
 #include "chrome/browser/history/url_index_private_data.h"
 #include "chrome/browser/search_engines/chrome_template_url_service_client.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
+#include "components/history/core/browser/history_service_observer.h"
 #include "components/history/core/browser/url_database.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
 #include "components/omnibox/autocomplete_match.h"
 #include "components/omnibox/autocomplete_result.h"
 #include "components/search_engines/search_terms_data.h"
 #include "components/search_engines/template_url.h"
 #include "components/search_engines/template_url_service.h"
-#include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "sql/transaction.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ASCIIToUTF16;
 using base::Time;
 using base::TimeDelta;
 
 using content::BrowserThread;
@@ skipping 45 matching lines @@
   {"http://popularsitewithroot.com/", "popularsitewithroot.com", 50, 50, 0},
   {"http://testsearch.com/?q=thequery", "Test Search Engine", 10, 10, 0},
   {"http://testsearch.com/", "Test Search Engine", 9, 9, 0},
   {"http://anotherengine.com/?q=thequery", "Another Search Engine", 8, 8, 0},
   // The encoded stuff between /wiki/ and the # is 第二次世界大戦
   {"http://ja.wikipedia.org/wiki/%E7%AC%AC%E4%BA%8C%E6%AC%A1%E4%B8%96%E7%95"
    "%8C%E5%A4%A7%E6%88%A6#.E3.83.B4.E3.82.A7.E3.83.AB.E3.82.B5.E3.82.A4.E3."
    "83.A6.E4.BD.93.E5.88.B6", "Title Unimportant", 2, 2, 0}
 };
 
+// Wait for OnURLsDeletedNotification.

[sky, 2014/12/11 15:59:54]

Waits for OnOURSDeletedNotification and when run quits the supplied run loop.

[nshaik, 2014/12/12 05:40:55]

Done.

+class WaitForURLsDeletedObserver : public history::HistoryServiceObserver {
+ public:
+  explicit WaitForURLsDeletedObserver(content::MessageLoopRunner* runner);
+  ~WaitForURLsDeletedObserver() override;
+
+ private:
+  // history::HistoryServiceObserver:
+  void OnURLsDeleted(HistoryService* service,
+                     bool all_history,
+                     bool expired,
+                     const history::URLRows& deleted_rows,
+                     const std::set<GURL>& favicon_urls) override;
+  // weak

[Peter Kasting, 2014/12/11 19:59:34]

Nit: Blank line above this; also, comments should have capitalization, periods,
etc.  (You could take the opportunity to say who actually owns the runner.)

[nshaik, 2014/12/12 05:40:56]

Done.

+  content::MessageLoopRunner* runner_;
+};

[sky, 2014/12/11 15:59:54]

DISALLOW_...

[nshaik, 2014/12/12 05:40:56]

Done.

+
+WaitForURLsDeletedObserver::WaitForURLsDeletedObserver(
+    content::MessageLoopRunner* runner)
+    : runner_(runner) {
+}
+
+WaitForURLsDeletedObserver::~WaitForURLsDeletedObserver() {
+}
+
+void WaitForURLsDeletedObserver::OnURLsDeleted(
+    HistoryService* service,
+    bool all_history,
+    bool expired,
+    const history::URLRows& deleted_rows,
+    const std::set<GURL>& favicon_urls) {
+  runner_->Quit();
+}
+
+void WaitForURLsDeletedNotification(HistoryService* history_service) {
+  scoped_refptr<content::MessageLoopRunner> runner =

[sky, 2014/12/11 15:59:54]

Why not use a RunLoop on the stack here? Seems simpler.

[sdefresne, 2014/12/11 16:04:08]

content::MessageLoopRunner is a base::RefCounted and has a private destructor.
The only way to get it destroyed is to go through a Release call that does end
up calling "delete this".

[sky, 2014/12/11 17:02:04]

I'm suggesting you change this line to:

base::RunLoop runner;

[nshaik, 2014/12/12 05:40:55]

Done.

+      new content::MessageLoopRunner;
+  WaitForURLsDeletedObserver observer(runner.get());
+  ScopedObserver<HistoryService, history::HistoryServiceObserver>
+      scoped_observer(&observer);
+  scoped_observer.Add(history_service);
+  runner->Run();
+}
+
 class HistoryQuickProviderTest : public testing::Test {
  public:
   HistoryQuickProviderTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         file_thread_(BrowserThread::FILE, &message_loop_) {}
 
  protected:
   class SetShouldContain : public std::unary_function<const std::string&,
                                                       std::set<std::string> > {
    public:
@@ skipping 452 matching lines @@
   EXPECT_EQ(1U, ac_matches_.size());
   EXPECT_TRUE(history_backend()->GetURL(test_url, NULL));
   provider_->DeleteMatch(ac_matches_[0]);
 
   // Check that the underlying URL is deleted from the history DB (this implies
   // that all visits are gone as well). Also verify that a deletion notification
   // is sent, in response to which the secondary data stores (InMemoryDatabase,
   // InMemoryURLIndex) will drop any data they might have pertaining to the URL.
   // To ensure that the deletion has been propagated everywhere before we start
   // verifying post-deletion states, first wait until we see the notification.
-  content::WindowedNotificationObserver observer(
-        chrome::NOTIFICATION_HISTORY_URLS_DELETED,
-        content::NotificationService::AllSources());
-  observer.Wait();
+  WaitForURLsDeletedNotification(history_service_);
   EXPECT_FALSE(history_backend()->GetURL(test_url, NULL));
 
   // Just to be on the safe side, explicitly verify that we have deleted enough
   // data so that we will not be serving the same result again.
   expected_urls.clear();
   RunTest(ASCIIToUTF16("slashdot"), false, expected_urls, true,
           ASCIIToUTF16("NONE EXPECTED"), base::string16());
 }
 
 TEST_F(HistoryQuickProviderTest, PreventBeatingURLWhatYouTypedMatch) {
@@ skipping 182 matching lines @@
 
 TEST_F(HQPOrderingTest, TEAMatch) {
   std::vector<std::string> expected_urls;
   expected_urls.push_back("http://www.teamliquid.net/");
   expected_urls.push_back("http://www.teamliquid.net/tlpd");
   expected_urls.push_back("http://www.teamliquid.net/tlpd/korean/players");
   RunTest(ASCIIToUTF16("tea"), false, expected_urls, true,
           ASCIIToUTF16("www.teamliquid.net"),
                  ASCIIToUTF16("mliquid.net"));
 }