summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 04:07:44 +0000
committerkerz@chromium.org <kerz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-04 04:07:44 +0000
commitb8d6cae75a9eb62043f27445cf27de7048435566 (patch)
tree7ccb2528f8a36989e1e7b3d4f11eab6d9362c34a
parent9ad4f17502f5aaa28d03c2ac6c3f3e866f83ac19 (diff)
downloadchromium_src-b8d6cae75a9eb62043f27445cf27de7048435566.zip
chromium_src-b8d6cae75a9eb62043f27445cf27de7048435566.tar.gz
chromium_src-b8d6cae75a9eb62043f27445cf27de7048435566.tar.bz2
Fix Geolocation tests to work on Official Chrome builders.
BUG=125957 TBR=bulach Review URL: http://codereview.chromium.org/10346008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135290 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/geolocation/network_location_provider_unittest.cc11
1 files changed, 9 insertions, 2 deletions
diff --git a/content/browser/geolocation/network_location_provider_unittest.cc b/content/browser/geolocation/network_location_provider_unittest.cc
index 6735acc..f2adee3 100644
--- a/content/browser/geolocation/network_location_provider_unittest.cc
+++ b/content/browser/geolocation/network_location_provider_unittest.cc
@@ -22,8 +22,15 @@ namespace {
// Constants used in multiple tests.
const char kTestServerUrl[] = "https://www.geolocation.test/service";
-const char kTestJson[] = "?browser=chromium&sensor=true";
-const char kTestBrowser[] = "browser=chromium";
+
+#if defined(GOOGLE_CHROME_BUILD)
+ const char kTestJson[] = "?browser=googlechrome&sensor=true";
+ const char kTestBrowser[] = "browser=googlechrome";
+#else
+ const char kTestJson[] = "?browser=chromium&sensor=true";
+ const char kTestBrowser[] = "browser=chromium";
+#endif
+
const char kTestSensor[] = "sensor=true";
// Using #define so we can easily paste this into various other strings.
#define REFERENCE_ACCESS_TOKEN "2:k7j3G6LaL6u_lafw:4iXOeOpTh1glSXe"