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

content/browser/debugger/devtools_sanity_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/command_line.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/debugger/devtools_client_host.h"
 #include "content/browser/debugger/devtools_manager.h"
 #include "content/browser/debugger/devtools_window.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/common/notification_registrar.h"
 #include "content/common/notification_service.h"
 #include "net/test/test_server.h"
 
 namespace {
 
 // Used to block until a dev tools client window's browser is closed.
 class BrowserClosedObserver : public NotificationObserver {
  public:
   explicit BrowserClosedObserver(Browser* browser) {
-    registrar_.Add(this, NotificationType::BROWSER_CLOSED,
+    registrar_.Add(this, chrome::NOTIFICATION_BROWSER_CLOSED,
                    Source<Browser>(browser));
     ui_test_utils::RunMessageLoop();
   }
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     MessageLoopForUI::current()->Quit();
   }
 
  private:
   NotificationRegistrar registrar_;
   DISALLOW_COPY_AND_ASSIGN(BrowserClosedObserver);
 };
 
@@ skipping 128 matching lines @@
     FilePath path = test_extensions_dir_.AppendASCII(extension_name);
     ASSERT_TRUE(LoadExtensionFromPath(path)) << "Failed to load extension.";
   }
 
  private:
   bool LoadExtensionFromPath(const FilePath& path) {
     ExtensionService* service = browser()->profile()->GetExtensionService();
     size_t num_before = service->extensions()->size();
     {
       NotificationRegistrar registrar;
-      registrar.Add(this, NotificationType::EXTENSION_LOADED,
+      registrar.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED,
                     NotificationService::AllSources());
       CancelableQuitTask* delayed_quit =
           new CancelableQuitTask("Extension load timed out.");
       MessageLoop::current()->PostDelayedTask(FROM_HERE, delayed_quit,
           4*1000);
       service->LoadExtension(path);
       ui_test_utils::RunMessageLoop();
       delayed_quit->cancel();
     }
     size_t num_after = service->extensions()->size();
     if (num_after != (num_before + 1))
       return false;
 
     return WaitForExtensionHostsToLoad();
   }
 
   bool WaitForExtensionHostsToLoad() {
     // Wait for all the extension hosts that exist to finish loading.
     // NOTE: This assumes that the extension host list is not changing while
     // this method is running.
 
     NotificationRegistrar registrar;
-    registrar.Add(this, NotificationType::EXTENSION_HOST_DID_STOP_LOADING,
+    registrar.Add(this, chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING,
                   NotificationService::AllSources());
     CancelableQuitTask* delayed_quit =
         new CancelableQuitTask("Extension host load timed out.");
     MessageLoop::current()->PostDelayedTask(FROM_HERE, delayed_quit,
         4*1000);
 
     ExtensionProcessManager* manager =
           browser()->profile()->GetExtensionProcessManager();
     for (ExtensionProcessManager::const_iterator iter = manager->begin();
          iter != manager->end();) {
       if ((*iter)->did_stop_loading())
         ++iter;
       else
         ui_test_utils::RunMessageLoop();
     }
 
     delayed_quit->cancel();
     return true;
   }
 
-  void Observe(NotificationType type,
+  void Observe(int type,
                const NotificationSource& source,
                const NotificationDetails& details) {
-    switch (type.value) {
-      case NotificationType::EXTENSION_LOADED:
-      case NotificationType::EXTENSION_HOST_DID_STOP_LOADING:
+    switch (type) {
+      case chrome::NOTIFICATION_EXTENSION_LOADED:
+      case chrome::NOTIFICATION_EXTENSION_HOST_DID_STOP_LOADING:
         MessageLoopForUI::current()->Quit();
         break;
       default:
         NOTREACHED();
         break;
     }
   }
 
   FilePath test_extensions_dir_;
 };
@@ skipping 70 matching lines @@
           client_contents_->render_view_host(),
           L"",
           L"window.domAutomationController.send("
           L"'' + (window.uiTests && (typeof uiTests.runTest)));",
           &result));
   ASSERT_EQ("function", result) << "DevTools front-end is broken.";
   CloseDevToolsWindow();
 }
 
 }  // namespace