Moving notification types which are chrome specific to a new header file chrome_notification_type...

chrome/browser/autocomplete/autocomplete_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 "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/autocomplete/autocomplete.h"
 #include "chrome/browser/autocomplete/autocomplete_match.h"
 #include "chrome/browser/autocomplete/keyword_provider.h"
 #include "chrome/browser/autocomplete/search_provider.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_service.h"
 #include "chrome/browser/search_engines/template_url_service_factory.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/test/testing_browser_process.h"
 #include "chrome/test/testing_browser_process_test.h"
 #include "chrome/test/testing_profile.h"
 #include "content/common/notification_observer.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 static std::ostream& operator<<(std::ostream& os,
                                 const AutocompleteResult::const_iterator& it) {
@@ skipping 88 matching lines @@
   void ResetControllerWithTestProvidersWithKeywordAndSearchProviders();
   void RunExactKeymatchTest(bool allow_exact_keyword_match);
 
   // These providers are owned by the controller once it's created.
   ACProviders providers_;
 
   AutocompleteResult result_;
 
  private:
   // NotificationObserver
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details);
 
   ScopedTestingBrowserProcess browser_process_;
 
   MessageLoopForUI message_loop_;
   scoped_ptr<AutocompleteController> controller_;
   NotificationRegistrar registrar_;
   TestingProfile profile_;
 };
@@ skipping 16 matching lines @@
   providers_.push_back(providerB);
 
   // Reset the controller to contain our new providers.
   AutocompleteController* controller = new AutocompleteController(providers_);
   controller_.reset(controller);
   providerA->set_listener(controller);
   providerB->set_listener(controller);
 
   // The providers don't complete synchronously, so listen for "result updated"
   // notifications.
-  registrar_.Add(this, NotificationType::AUTOCOMPLETE_CONTROLLER_RESULT_READY,
+  registrar_.Add(this,
+                 chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY,
                  NotificationService::AllSources());
 }
 
 void AutocompleteProviderTest::
     ResetControllerWithTestProvidersWithKeywordAndSearchProviders() {
   profile_.CreateTemplateURLService();
 
   // Reset the default TemplateURL.
   TemplateURL* default_t_url = new TemplateURL();
   default_t_url->SetURL("http://defaultturl/{searchTerms}", 0, 0);
@@ skipping 50 matching lines @@
                      allow_exact_keyword_match,
                      AutocompleteInput::SYNCHRONOUS_MATCHES);
   EXPECT_TRUE(controller_->done());
   // ResetControllerWithKeywordAndSearchProviders() adds the keyword provider
   // first, then the search provider.  So if the default match is a keyword
   // match, it will come from provider 0, otherwise from provider 1.
   EXPECT_EQ(providers_[allow_exact_keyword_match ? 0 : 1],
       controller_->result().default_match()->provider);
 }
 
-void AutocompleteProviderTest::Observe(NotificationType type,
+void AutocompleteProviderTest::Observe(int type,
                                        const NotificationSource& source,
                                        const NotificationDetails& details) {
   if (controller_->done()) {
     result_.CopyFrom(controller_->result());
     MessageLoop::current()->Quit();
   }
 }
 
 // Tests that the default selection is set properly when updating results.
 TEST_F(AutocompleteProviderTest, Query) {
@@ skipping 225 matching lines @@
     EXPECT_EQ(input_cases[i].scheme.len, scheme.len) << "Input: " <<
         input_cases[i].input;
     EXPECT_EQ(input_cases[i].host.begin, host.begin) << "Input: " <<
         input_cases[i].input;
     EXPECT_EQ(input_cases[i].host.len, host.len) << "Input: " <<
         input_cases[i].input;
   }
 }
 
 }  // namespace