Move notifications used only in chrome/ out of content/.

chrome/browser/ui/omnibox/omnibox_view_browsertest.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 <stdio.h>
 
 #include "base/message_loop.h"
 #include "base/string16.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 207 matching lines @@
         type, source);
   }
 
   void WaitForTabOpenOrCloseForBrowser(const Browser* browser,
                                        int expected_tab_count) {
     int tab_count = browser->tab_count();
     if (tab_count == expected_tab_count)
       return;
 
     content::NotificationRegistrar registrar;
-    registrar.Add(this,
-                  (tab_count < expected_tab_count ?
-                   content::NOTIFICATION_TAB_PARENTED :
-                   content::NOTIFICATION_TAB_CLOSED),
-                   content::NotificationService::AllSources());
+    registrar.Add(
+        this,
+        tab_count < expected_tab_count
+            ? static_cast<int>(chrome::NOTIFICATION_TAB_PARENTED)

[jam, 2012/04/15 22:10:18]

nit: you shouldn't need a cast here?

[Avi (use Gerrit), 2012/04/16 00:09:39]

It wouldn't be there if I didn't need it :) chrome::XXX and content:XXX are two
different types; you can't ?: them together without a cast because the compiler
won't know what type to make the result. (See the C++98 standard §5.16¶5; "if
the overload resolution fails, the program is ill-formed".)

+            : static_cast<int>(content::NOTIFICATION_WEB_CONTENTS_DESTROYED),
+        content::NotificationService::AllSources());
 
     while (!HasFailure() && browser->tab_count() != expected_tab_count)
       ui_test_utils::RunMessageLoop();
 
     ASSERT_EQ(expected_tab_count, browser->tab_count());
   }
 
   void WaitForTabOpenOrClose(int expected_tab_count) {
     WaitForTabOpenOrCloseForBrowser(browser(), expected_tab_count);
   }
@@ skipping 121 matching lines @@
   void SetupComponents() {
     ASSERT_NO_FATAL_FAILURE(SetupHostResolver());
     ASSERT_NO_FATAL_FAILURE(SetupSearchEngine());
     ASSERT_NO_FATAL_FAILURE(SetupHistory());
   }
 
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) {
     switch (type) {
-      case content::NOTIFICATION_TAB_CLOSED:
-      case content::NOTIFICATION_TAB_PARENTED:
+      case content::NOTIFICATION_WEB_CONTENTS_DESTROYED:
+      case chrome::NOTIFICATION_TAB_PARENTED:
       case chrome::NOTIFICATION_AUTOCOMPLETE_CONTROLLER_RESULT_READY:
       case chrome::NOTIFICATION_BOOKMARK_MODEL_LOADED:
       case chrome::NOTIFICATION_HISTORY_LOADED:
       case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED:
       case chrome::NOTIFICATION_TEMPLATE_URL_SERVICE_LOADED:
         break;
       default:
         FAIL() << "Unexpected notification type";
     }
     MessageLoop::current()->Quit();
@@ skipping 1088 matching lines @@
 
   // Paste text.
   ASSERT_NO_FATAL_FAILURE(SendKey(ui::VKEY_V, ui::EF_CONTROL_DOWN));
   ASSERT_NO_FATAL_FAILURE(WaitForAutocompleteControllerDone());
   ASSERT_TRUE(popup_model->IsOpen());
 
   // Inline autocomplete shouldn't be triggered.
   ASSERT_EQ(ASCIIToUTF16("abc"), omnibox_view->GetText());
 }
 #endif