chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc - Issue 23710022: Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

Issue 23710022: Convert NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED to CallbackList (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/sync/glue/search_engine_data_type_controller.cc ('k') | chrome/browser/ui/omnibox/omnibox_view_browsertest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

diff --git a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

index 3f95b143420f15121da9397482e3347fe81a0981..46854467795b8968f2673df7c8bd897f8d655d19 100644

--- a/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

+++ b/chrome/browser/sync/glue/search_engine_data_type_controller_unittest.cc

@@ -8,7 +8,6 @@

#include "base/memory/scoped_ptr.h"

#include "base/run_loop.h"

#include "base/tracked_objects.h"

-#include "chrome/browser/chrome_notification_types.h"

#include "chrome/browser/search_engines/template_url_service_factory.h"

#include "chrome/browser/search_engines/template_url_service_test_util.h"

#include "chrome/browser/sync/glue/data_type_controller_mock.h"

@@ -17,7 +16,6 @@

#include "chrome/browser/sync/profile_sync_components_factory_mock.h"

#include "chrome/browser/sync/profile_sync_service_mock.h"

#include "chrome/test/base/profile_mock.h"

-#include "content/public/browser/notification_service.h"

#include "sync/api/fake_syncable_service.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -137,10 +135,7 @@ TEST_F(SyncSearchEngineDataTypeControllerTest, StartURLServiceNotReady) {

EXPECT_FALSE(syncable_service_.syncing());

// Send the notification that the TemplateURLService has started.

- content::NotificationService::current()->Notify(

- chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED,

- content::Source<TemplateURLService>(test_util_.model()),

- content::NotificationService::NoDetails());

+ PreloadTemplateURLService();

EXPECT_EQ(DataTypeController::MODEL_LOADED, search_engine_dtc_->state());

// Wait until WebDB is loaded before we shut it down.