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

content/browser/renderer_host/render_view_host_browsertest.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/time.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/in_process_browser_test.h"
 #include "chrome/test/ui_test_utils.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_observer.h"
 #include "content/common/view_messages.h"
 #include "net/base/host_port_pair.h"
 #include "net/test/test_server.h"
 
 typedef std::pair<int, Value*> ExecuteDetailType;
 
 namespace {
 
 // NotificationObserver used to listen for EXECUTE_JAVASCRIPT_RESULT
 // notifications.
 class ExecuteNotificationObserver : public NotificationObserver {
  public:
   ExecuteNotificationObserver() : id_(0) {}
 
-  virtual void Observe(NotificationType type,
+  virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) {
     id_ = (static_cast<Details<ExecuteDetailType > >(details))->first;
     Value* value = (static_cast<Details<ExecuteDetailType > >(details))->second;
     if (value)
       value_.reset(value->DeepCopy());
     MessageLoopForUI::current()->Quit();
   }
 
   int id() const { return id_; }
@@ skipping 18 matching lines @@
     RenderViewHost* rvh =
         browser()->GetSelectedTabContents()->render_view_host();
     ASSERT_TRUE(rvh);
     int execute_id = rvh->ExecuteJavascriptInWebFrameNotifyResult(
         string16(),
         ASCIIToUTF16(script));
     EXPECT_NE(execute_id, last_execute_id_);
     ExecuteNotificationObserver observer;
     ui_test_utils::RegisterAndWait(
         out_result,
-        NotificationType::EXECUTE_JAVASCRIPT_RESULT,
+        content::NOTIFICATION_EXECUTE_JAVASCRIPT_RESULT,
         Source<RenderViewHost>(rvh));
     EXPECT_EQ(execute_id, out_result->id());
     ASSERT_TRUE(out_result->value());
     last_execute_id_ = execute_id;
   }
 
  private:
   int last_execute_id_;
 };
 
@@ skipping 159 matching lines @@
   RenderViewHostTestTabContentsObserver observer(
       browser()->GetSelectedTabContents());
 
   GURL test_url = test_server()->GetURL("files/simple.html");
   ui_test_utils::NavigateToURL(browser(), test_url);
 
   EXPECT_EQ(test_server()->host_port_pair().ToString(),
             observer.observed_socket_address().ToString());
   EXPECT_EQ(1, observer.navigation_count());
 }