content: convert zoom notifications to observer usage

chrome/browser/ui/zoom/zoom_controller_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 "base/message_loop.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/browser/ui/zoom/zoom_observer.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/navigation_details.h"
-#include "content/public/browser/notification_details.h"
-#include "content/public/browser/notification_source.h"
-#include "content/public/browser/notification_types.h"
 #include "content/public/common/frame_navigate_params.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class TestZoomObserver : public ZoomObserver {
  public:
   MOCK_METHOD2(OnZoomChanged, void(content::WebContents*, bool));
 };
@@ skipping 34 matching lines @@
   profile()->GetPrefs()->SetDouble(prefs::kDefaultZoomLevel, 110.0f);
 }
 
 TEST_F(ZoomControllerTest, Observe) {
   EXPECT_CALL(zoom_observer_, OnZoomChanged(web_contents(), false)).Times(1);
 
   content::HostZoomMap* host_zoom_map =
       content::HostZoomMap::GetForBrowserContext(
           web_contents()->GetBrowserContext());
 
-  content::WindowedNotificationObserver notification_observer(
-      content::NOTIFICATION_ZOOM_LEVEL_CHANGED,
-      content::NotificationService::AllSources());
-
   host_zoom_map->SetZoomLevel(std::string(), 110.0f);
-
-  notification_observer.Wait();

[jam, 2013/01/30 17:50:44]

can you update the test to verify that callbacks are called?

[Paweł Hajdan Jr., 2013/01/31 16:02:15]

It already does - see EXPECT_CALL above. The call is synchronous, so there is no
need to spin a message loop or anything like that.

 }