Make NotificationService an interface in the content namespace, and switch callers to use it. Mov...

chrome_frame/test/net/fake_external_tab.cc

 // Copyright (c) 2011 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_frame/test/net/fake_external_tab.h"
 
 #include <atlbase.h>
 #include <atlcom.h>
 #include <exdisp.h>
 
@@ skipping 31 matching lines @@
 #include "chrome/renderer/chrome_content_renderer_client.h"
 #include "chrome_frame/crash_server_init.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/net/test_automation_resource_message_filter.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test/win_event_receiver.h"
 #include "chrome_frame/utils.h"
 #include "content/browser/plugin_service.h"
 #include "content/browser/renderer_host/render_process_host.h"
 #include "content/common/content_paths.h"
-#include "content/common/notification_service.h"
+#include "content/browser/notification_service_impl.h"
 #include "content/public/common/content_client.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
 
 namespace {
 
 // A special command line switch to allow developers to manually launch the
 // browser and debug CF inside the browser.
 const char kManualBrowserLaunch[] = "manual-browser";
@@ skipping 162 matching lines @@
 
 FakeExternalTab::~FakeExternalTab() {
   if (!overridden_user_dir_.empty()) {
     PathService::Override(chrome::DIR_USER_DATA, overridden_user_dir_);
   }
 }
 
 void FakeExternalTab::Initialize() {
   DCHECK(g_browser_process == NULL);
 
-  notificaton_service_.reset(new NotificationService);
+  notificaton_service_.reset(new NotificationServiceImpl);
 
   base::SystemMonitor system_monitor;
 
   icu_util::Initialize();
   TestTimeouts::Initialize();
 
   // Do not call chrome::RegisterPathProvider() since it is also called by our
   // test runner, CFUrlRequestUnittestRunner, and calling it twice unfortunately
   // causes a DCHECK().
   content::RegisterPathProvider();
@@ skipping 156 matching lines @@
   DCHECK_EQ(test_thread_.IsValid(), false);
   test_thread_.Set(::CreateThread(NULL, 0, RunAllUnittests, this, 0,
                                   &test_thread_id_));
   DCHECK(test_thread_.IsValid());
 }
 
 // static
 DWORD CFUrlRequestUnittestRunner::RunAllUnittests(void* param) {
   base::PlatformThread::SetName("CFUrlRequestUnittestRunner");
   // Needed for some url request tests like the intercept job tests, etc.
-  NotificationService service;
+  NotificationServiceImpl service;
   CFUrlRequestUnittestRunner* me =
       reinterpret_cast<CFUrlRequestUnittestRunner*>(param);
   me->test_result_ = me->Run();
   me->fake_chrome_.ui_loop()->PostTask(FROM_HERE,
       NewRunnableFunction(TakeDownBrowser, me));
   return 0;
 }
 
 // static
 void CFUrlRequestUnittestRunner::TakeDownBrowser(
@@ skipping 171 matching lines @@
   base::KillProcesses(chrome_frame_test::kIEImageName, 0, NULL);
   base::KillProcesses(chrome_frame_test::kIEBrokerImageName, 0, NULL);
   // Avoid CRT cleanup in debug test runs to ensure that webkit ASSERTs which
   // check if globals are created and destroyed on the same thread don't fire.
   // Webkit global objects are created on the inproc renderer thread.
 #if !defined(NDEBUG)
   ExitProcess(test_suite.test_result());
 #endif  // NDEBUG
   return test_suite.test_result();
 }