Revert 42757 - Uses GeolocationContentSettingsMap on GeolocationPermissionCon...

chrome/browser/geolocation/geolocation_browsertest.cc

 // Copyright (c) 2009 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/string_util.h"
 #include "base/waitable_event.h"
 #include "chrome/browser/app_modal_dialog.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/dom_operation_notification_details.h"
-#include "chrome/browser/geolocation/geolocation_content_settings_map.h"
 #include "chrome/browser/geolocation/location_arbitrator.h"
 #include "chrome/browser/geolocation/location_provider.h"
 #include "chrome/browser/geolocation/mock_location_provider.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/renderer_host/render_view_host.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/geoposition.h"
 #include "chrome/common/notification_details.h"
@@ skipping 143 matching lines @@
 // 1. Infobar is displayed when a geolocation is requested from an unauthorized
 // origin.
 // 2. Denying the infobar triggers the correct error callback.
 // 3. Allowing the infobar does not trigger an error, and allow a geoposition to
 // be passed to javascript.
 // 4. Permissions persisted in disk are respected.
 // 5. Off the record profiles don't use saved permissions.
 class GeolocationBrowserTest : public InProcessBrowserTest {
  public:
   GeolocationBrowserTest()
-    : infobar_(NULL),
-      current_browser_(NULL),
+    : infobar_(NULL), current_browser_(NULL),
       html_for_tests_("files/geolocation/simple.html") {
     EnableDOMAutomation();
   }
 
   enum InitializationOptions {
     INITIALIZATION_NONE,
     INITIALIZATION_OFFTHERECORD,
     INITIALIZATION_NEWTAB,
     INITIALIZATION_IFRAMES,
   };
@@ skipping 44 matching lines @@
     LOG(WARNING) << "got geolocation watch";
 
     if (wait_for_infobar) {
       if (!notification_observer.infobar_) {
         LOG(WARNING) << "will block for infobar";
         ui_test_utils::RunMessageLoop();
         LOG(WARNING) << "infobar created";
       }
       EXPECT_TRUE(notification_observer.infobar_);
       infobar_ = notification_observer.infobar_;
-    } else {
-      // Infobar wasn't displayed, so we need to wait for the JS prompt instead.
-      WaitForJSPrompt();
     }
   }
 
   Geoposition GeopositionFromLatLong(double latitude, double longitude) {
     Geoposition geoposition;
     geoposition.latitude = latitude;
     geoposition.longitude = longitude;
     geoposition.accuracy = 0;
     geoposition.error_code = Geoposition::ERROR_CODE_NONE;
     // Webkit compares the timestamp to wall clock time, so we need
@@ skipping 125 matching lines @@
 
 #if defined(OS_MACOSX)
 // TODO(bulach): investigate why this fails on mac. It may be related to:
 // http://crbug.com//29424
 #define MAYBE_NoInfobarForSecondTab DISABLED_NoInfobarForSecondTab
 #else
 #define MAYBE_NoInfobarForSecondTab NoInfobarForSecondTab
 #endif
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForSecondTab) {
+#if 0
+  // TODO(bulach): enable this test once we use HostContentSettingsMap instead
+  // of files.
   Initialize(INITIALIZATION_NONE);
-  AddGeolocationWatch(true);
+  SendGeoposition(true, GeopositionFromLatLong(0, 0));
   SetInfobarResponse(current_url_, true);
   // Checks infobar will not be created a second tab.
   Initialize(INITIALIZATION_NEWTAB);
-  AddGeolocationWatch(false);
-  CheckGeoposition(MockLocationProvider::instance_->position_);
+  SendGeoposition(false, GeopositionFromLatLong(0, 0));
+  CheckStringValueFromJavascript("0", "geoGetLastError()");
+#endif
 }
 
 #if defined(OS_MACOSX)
 // TODO(bulach): investigate why this fails on mac. It may be related to:
 // http://crbug.com//29424
 #define MAYBE_NoInfobarForDeniedOrigin DISABLED_NoInfobarForDeniedOrigin
 #else
 #define MAYBE_NoInfobarForDeniedOrigin NoInfobarForDeniedOrigin
 #endif
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForDeniedOrigin) {
+#if 0
+  // TODO(bulach): enable this test once we use HostContentSettingsMap instead
+  // of files.
+  WritePermissionFile("{\"allowed\":false}");
+  // Checks no infobar will be created.
   Initialize(INITIALIZATION_NONE);
-  current_browser_->profile()->GetGeolocationContentSettingsMap()->
-      SetContentSetting(current_url_, current_url_, CONTENT_SETTING_BLOCK);
-  AddGeolocationWatch(false);
-  // Checks we have an error for this denied origin.
+  SendGeoposition(false, GeopositionFromLatLong(0, 0));
   CheckStringValueFromJavascript("1", "geoGetLastError()");
   // Checks infobar will not be created a second tab.
   Initialize(INITIALIZATION_NEWTAB);
-  AddGeolocationWatch(false);
+  SendGeoposition(false, GeopositionFromLatLong(0, 0));
   CheckStringValueFromJavascript("1", "geoGetLastError()");
+#endif
 }
 
 #if defined(OS_MACOSX)
 // TODO(bulach): investigate why this fails on mac. It may be related to:
 // http://crbug.com//29424
 #define MAYBE_NoInfobarForAllowedOrigin DISABLED_NoInfobarForAllowedOrigin
 #else
 #define MAYBE_NoInfobarForAllowedOrigin NoInfobarForAllowedOrigin
 #endif
 
 IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest,
                        MAYBE_NoInfobarForAllowedOrigin) {
-  Initialize(INITIALIZATION_NONE);
-  current_browser_->profile()->GetGeolocationContentSettingsMap()->
-      SetContentSetting(current_url_, current_url_, CONTENT_SETTING_ALLOW);
+#if 0
+  // TODO(bulach): enable this test once we use HostContentSettingsMap instead
+  // of files.
+  WritePermissionFile("{\"allowed\":true}");
   // Checks no infobar will be created and there's no error callback.
   Initialize(INITIALIZATION_NONE);
-  AddGeolocationWatch(false);
-  CheckGeoposition(MockLocationProvider::instance_->position_);
+  SendGeoposition(false, GeopositionFromLatLong(0, 0));
+  CheckStringValueFromJavascript("0", "geoGetLastError()");
+#endif
 }
 
 #if defined(OS_MACOSX)
 // TODO(bulach): investigate why this fails on mac. It may be related to:
 // http://crbug.com//29424
 #define MAYBE_InfobarForOffTheRecord DISABLED_InfobarForOffTheRecord
 #else
 #define MAYBE_InfobarForOffTheRecord InfobarForOffTheRecord
 #endif
 
-IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_NoInfobarForOffTheRecord) {
-  // First, check infobar will be created for regular profile
+IN_PROC_BROWSER_TEST_F(GeolocationBrowserTest, MAYBE_InfobarForOffTheRecord) {
+  // Checks infobar will be created for regular profile.
   Initialize(INITIALIZATION_NONE);
   AddGeolocationWatch(true);
-  // Response will be persisted
   SetInfobarResponse(current_url_, true);
   CheckGeoposition(MockLocationProvider::instance_->position_);
   // Disables further prompts from this tab.
   CheckStringValueFromJavascript("false", "geoEnableAlerts(false)");
-  // Go off the record, and checks no infobar will be created.
+  // Go off the record, and checks infobar will be created and an error callback
+  // is triggered.
   Initialize(INITIALIZATION_OFFTHERECORD);
-  AddGeolocationWatch(false);
-  CheckGeoposition(MockLocationProvider::instance_->position_);
+  AddGeolocationWatch(true);
+  SetInfobarResponse(current_url_, false);
+  CheckStringValueFromJavascript("1", "geoGetLastError()");
 }
 
 #if defined(OS_MACOSX)
 // TODO(bulach): investigate why this fails on mac. It may be related to:
 // http://crbug.com//29424
 #define MAYBE_IFramesWithFreshPosition DISABLED_IFramesWithFreshPosition
 #else
 // TODO(bulach): investigate this failure.
 // http://build.chromium.org/buildbot/waterfall/builders/XP%20Tests/builds/18549/steps/browser_tests/logs/stdio
 #define MAYBE_IFramesWithFreshPosition FLAKY_IFramesWithFreshPosition
@@ skipping 71 matching lines @@
 
   // Disable alert for this frame.
   CheckStringValueFromJavascript("false", "geoEnableAlerts(false)");
 
   // Now go ahead an authorize the second frame.
   iframe_xpath_ = L"//iframe[@id='iframe_1']";
   AddGeolocationWatch(true);
   SetInfobarResponse(iframe1_url_, true);
   CheckGeoposition(cached_position);
 }