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

chrome/browser/webdata/web_data_service_unittest.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 <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/webdata/autofill_change.h"
 #include "chrome/browser/webdata/autofill_entry.h"
 #include "chrome/browser/webdata/web_data_service.h"
 #include "chrome/browser/webdata/web_data_service_test_util.h"
 #include "chrome/browser/webdata/web_intents_table.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/guid.h"
 #include "chrome/test/base/thread_observer_helper.h"
 #include "content/browser/browser_thread.h"
-#include "content/common/notification_service.h"
+#include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_details.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/glue/form_field.h"
 
 using base::Time;
 using base::TimeDelta;
 using base::WaitableEvent;
 using testing::_;
 using testing::DoDefault;
 using testing::ElementsAreArray;
 using testing::Pointee;
 using testing::Property;
 
 typedef std::vector<AutofillChange> AutofillChangeList;
 
 static const int kWebDataServiceTimeoutSeconds = 8;
 
 ACTION_P(SignalEvent, event) {
   event->Signal();
 }
 
 class AutofillDBThreadObserverHelper : public DBThreadObserverHelper {
  protected:
   virtual void RegisterObservers() {
     registrar_.Add(&observer_,
                    chrome::NOTIFICATION_AUTOFILL_ENTRIES_CHANGED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
     registrar_.Add(&observer_,
                    chrome::NOTIFICATION_AUTOFILL_PROFILE_CHANGED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
     registrar_.Add(&observer_,
                    chrome::NOTIFICATION_AUTOFILL_CREDIT_CARD_CHANGED,
-                   NotificationService::AllSources());
+                   content::NotificationService::AllSources());
   }
 };
 
 class WebDataServiceTest : public testing::Test {
  public:
   WebDataServiceTest()
       : ui_thread_(BrowserThread::UI, &message_loop_),
         db_thread_(BrowserThread::DB) {}
 
  protected:
@@ skipping 578 matching lines @@
   WebIntentsConsumer::WaitUntilCalled();
   ASSERT_EQ(2U, consumer.intents.size());
 
   if (consumer.intents[0].action != ASCIIToUTF16("edit"))
     std::swap(consumer.intents[0],consumer.intents[1]);
 
   EXPECT_EQ(service, consumer.intents[0]);
   service.action = ASCIIToUTF16("share");
   EXPECT_EQ(service, consumer.intents[1]);
 }