| Index: chrome/browser/geolocation/geolocation_browsertest.cc
|
| ===================================================================
|
| --- chrome/browser/geolocation/geolocation_browsertest.cc (revision 91771)
|
| +++ chrome/browser/geolocation/geolocation_browsertest.cc (working copy)
|
| @@ -16,6 +16,7 @@
|
| #include "chrome/browser/ui/browser.h"
|
| #include "chrome/browser/ui/browser_list.h"
|
| #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.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"
|
| @@ -27,7 +28,6 @@
|
| #include "content/common/geoposition.h"
|
| #include "content/common/notification_details.h"
|
| #include "content/common/notification_service.h"
|
| -#include "content/common/notification_type.h"
|
| #include "net/base/net_util.h"
|
| #include "net/test/test_server.h"
|
|
|
| @@ -46,7 +46,7 @@
|
| &browser->GetSelectedTabContents()->controller();
|
| registrar_.Add(this, NotificationType::LOAD_STOP,
|
| Source<NavigationController>(controller));
|
| - registrar_.Add(this, NotificationType::DOM_OPERATION_RESPONSE,
|
| + registrar_.Add(this, chrome::DOM_OPERATION_RESPONSE,
|
| NotificationService::AllSources());
|
| std::string script = base::StringPrintf(
|
| "window.domAutomationController.setAutomationId(0);"
|
| @@ -76,7 +76,7 @@
|
| const NotificationDetails& details) {
|
| if (type == NotificationType::LOAD_STOP) {
|
| navigation_completed_ = true;
|
| - } else if (type == NotificationType::DOM_OPERATION_RESPONSE) {
|
| + } else if (type == chrome::DOM_OPERATION_RESPONSE) {
|
| Details<DomOperationNotificationDetails> dom_op_details(details);
|
| javascript_response_ = dom_op_details->json();
|
| javascript_completed_ = true;
|
| @@ -112,10 +112,10 @@
|
| infobar_(NULL),
|
| navigation_started_(false),
|
| navigation_completed_(false) {
|
| - registrar_.Add(this, NotificationType::DOM_OPERATION_RESPONSE,
|
| + registrar_.Add(this, chrome::DOM_OPERATION_RESPONSE,
|
| NotificationService::AllSources());
|
| if (wait_for_infobar) {
|
| - registrar_.Add(this, NotificationType::TAB_CONTENTS_INFOBAR_ADDED,
|
| + registrar_.Add(this, chrome::TAB_CONTENTS_INFOBAR_ADDED,
|
| NotificationService::AllSources());
|
| } else {
|
| registrar_.Add(this, NotificationType::NAV_ENTRY_COMMITTED,
|
| @@ -150,11 +150,11 @@
|
| virtual void Observe(NotificationType type,
|
| const NotificationSource& source,
|
| const NotificationDetails& details) {
|
| - if (type.value == NotificationType::TAB_CONTENTS_INFOBAR_ADDED) {
|
| + if (type.value == chrome::TAB_CONTENTS_INFOBAR_ADDED) {
|
| infobar_ = Details<InfoBarAddedDetails>(details).ptr();
|
| ASSERT_TRUE(infobar_->GetIcon());
|
| ASSERT_TRUE(infobar_->AsConfirmInfoBarDelegate());
|
| - } else if (type == NotificationType::DOM_OPERATION_RESPONSE) {
|
| + } else if (type == chrome::DOM_OPERATION_RESPONSE) {
|
| Details<DomOperationNotificationDetails> dom_op_details(details);
|
| javascript_response_ = dom_op_details->json();
|
| LOG(WARNING) << "javascript_response " << javascript_response_;
|
|
|