Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(32)

Issue 2615563004: Revert of Add some integration tests for the search geolocation disclosure. (Closed)

Created:
3 years, 11 months ago by dvadym
Modified:
3 years, 11 months ago
Reviewers:
benwells, gone
CC:
chromium-reviews, agrieve+watch_chromium.org, chrome-apps-syd-reviews_chromium.org
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Revert of Add some integration tests for the search geolocation disclosure. (patchset #7 id:120001 of https://codereview.chromium.org/2593393002/ ) Reason for revert: Test org.chromium.chrome.browser.infobar.SearchGeolocationDisclosureInfoBarTest#testInfoBarAppears fails, https://uberchromegw.corp.google.com/i/chromium.linux/builders/Android%20Tests/builds/36590 Original issue's description: > Add some integration tests for the search geolocation disclosure. > > This adds some basic java tests for the new disclosure UI. > > BUG=675858 > > Committed: https://crrev.com/0cdef7fe3c10147a42ad28e45b0f7bb5c274d973 > Cr-Commit-Position: refs/heads/master@{#441309} TBR=dfalcantara@chromium.org,benwells@chromium.org # Skipping CQ checks because original CL landed less than 1 days ago. NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=675858

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+20 lines, -266 lines) Patch
D chrome/android/java/src/org/chromium/chrome/browser/SearchGeolocationDisclosureTabHelper.java View 1 chunk +0 lines, -26 lines 0 comments Download
M chrome/android/java_sources.gni View 2 chunks +0 lines, -2 lines 0 comments Download
D chrome/android/javatests/src/org/chromium/chrome/browser/infobar/SearchGeolocationDisclosureInfoBarTest.java View 1 chunk +0 lines, -168 lines 0 comments Download
M chrome/browser/BUILD.gn View 1 chunk +0 lines, -1 line 0 comments Download
M chrome/browser/android/chrome_jni_registrar.cc View 2 chunks +0 lines, -3 lines 0 comments Download
M chrome/browser/android/search_geolocation_disclosure_tab_helper.h View 2 chunks +0 lines, -7 lines 0 comments Download
M chrome/browser/android/search_geolocation_disclosure_tab_helper.cc View 8 chunks +20 lines, -59 lines 0 comments Download

Messages

Total messages: 5 (2 generated)
dvadym
Created Revert of Add some integration tests for the search geolocation disclosure.
3 years, 11 months ago (2017-01-04 11:50:34 UTC) #2
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2615563004/1
3 years, 11 months ago (2017-01-04 11:50:45 UTC) #3
commit-bot: I haz the power
3 years, 11 months ago (2017-01-04 11:51:20 UTC) #5
Failed to apply patch for chrome/browser/android/chrome_jni_registrar.cc:
While running git apply --index -p1;
  error: patch failed: chrome/browser/android/chrome_jni_registrar.cc:89
  error: chrome/browser/android/chrome_jni_registrar.cc: patch does not apply

Patch:       chrome/browser/android/chrome_jni_registrar.cc
Index: chrome/browser/android/chrome_jni_registrar.cc
diff --git a/chrome/browser/android/chrome_jni_registrar.cc
b/chrome/browser/android/chrome_jni_registrar.cc
index
d090ae74257a400a4275880ea1981fdf4b71eeea..d7587c09e97d925cd504248fbaed0bfca75ceb78
100644
--- a/chrome/browser/android/chrome_jni_registrar.cc
+++ b/chrome/browser/android/chrome_jni_registrar.cc
@@ -89,7 +89,6 @@
 #include "chrome/browser/android/recently_closed_tabs_bridge.h"
 #include "chrome/browser/android/rlz/revenue_stats.h"
 #include
"chrome/browser/android/safe_browsing/safe_browsing_api_handler_bridge.h"
-#include "chrome/browser/android/search_geolocation_disclosure_tab_helper.h"
 #include "chrome/browser/android/service_tab_launcher.h"
 #include "chrome/browser/android/sessions/session_tab_helper_android.h"
 #include "chrome/browser/android/shortcut_helper.h"
@@ -374,8 +373,6 @@
     {"SceneLayer", RegisterSceneLayer},
     {"ScreenshotTask", chrome::android::RegisterScreenshotTask},
     {"ServiceTabLauncher", ServiceTabLauncher::Register},
-    {"SearchGeolocationDisclosureTabHelper",
-     SearchGeolocationDisclosureTabHelper::Register},
     {"ServiceWorkerPaymentAppBridge", RegisterServiceWorkerPaymentAppBridge},
     {"SessionTabHelper", RegisterSessionTabHelper},
     {"SigninInvestigator", SigninInvestigatorAndroid::Register},

Powered by Google App Engine
This is Rietveld 408576698