Update to 72.0.3626.81

nwjs · Jan 29, 2019 · 9fece9b · 9fece9b
1 parent 048a7be
commit 9fece9b
Show file tree

Hide file tree

Showing 83 changed files with 543 additions and 93 deletions.
diff --git a/DEPS b/DEPS
@@ -37,7 +37,7 @@ gclient_gn_args = [
 
 
 vars = {
-  "buildspec_platforms": "win, ios, linux64, chromeos, win64, android, mac64",
+  "buildspec_platforms": "win, linux64, mac64, win64",
   # Variable that can be used to support multiple build scenarios, like having
   # Chromium specific targets in a client project's GN file or sync dependencies
   # conditionally etc.
@@ -118,7 +118,7 @@ vars = {
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling V8
   # and whatever else without interference from each other.
-  'v8_revision': 'b3e92a585850996acba23c3bf9494724252707da',
+  'v8_revision': '4d72a9931a125d21901d25d67896f0e40105bd16',
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling swarming_client
   # and whatever else without interference from each other.
@@ -1176,7 +1176,7 @@ deps = {
     Var('chromium_git') + '/external/khronosgroup/webgl.git' + '@' + '5b6cbd789b9b91b4e46dde883c9f2ecb31eddade',
 
   'src/third_party/webrtc':
-    Var('webrtc_git') + '/src.git' + '@' + '787bfad256594bd7e835155bd9aa1fa78287878d',
+    Var('webrtc_git') + '/src.git' + '@' + '784fccbd71c0130b32345d81459b5d0cb07ff6e5',
 
   'src/third_party/xdg-utils': {
       'url': Var('chromium_git') + '/chromium/deps/xdg-utils.git' + '@' + 'd80274d5869b17b8c9067a1022e4416ee7ed5e0d',
@@ -1207,7 +1207,7 @@ deps = {
   #  Var('chromium_git') + '/v8/v8.git' + '@' +  Var('v8_revision'),
 
   'src-internal': {
-    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@a1b681e6d1616f027f3b16a47806e741ee84e610',
+    'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git@7291fc0eda0433bf9bd755dfa710819e15824430',
     'condition': 'checkout_src_internal',
   },
 

diff --git a/android_webview/test/embedded_test_server/java/AndroidManifest.xml b/android_webview/test/embedded_test_server/java/AndroidManifest.xml
@@ -8,7 +8,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     package="org.chromium.android_webview.test.support">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.INTERNET"/>
 

diff --git a/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml b/android_webview/tools/automated_ui_tests/java/AndroidManifest.xml
@@ -10,7 +10,7 @@
     android:versionCode="1"
     android:versionName="1.0" >
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="23" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="23" />
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

diff --git a/ash/assistant/ui/assistant_container_view.cc b/ash/assistant/ui/assistant_container_view.cc
@@ -219,6 +219,13 @@ int AssistantContainerView::GetDialogButtons() const {
 }
 
 views::FocusTraversable* AssistantContainerView::GetFocusTraversable() {
+  auto* focus_manager = GetFocusManager();
+  if (focus_manager && focus_manager->GetFocusedView())
+    return nullptr;
+
+  if (!FindFirstFocusableView())
+    return nullptr;
+
   return &focus_traversable_;
 }
 

diff --git a/ash/assistant/ui/assistant_container_view_focus_traversable.cc b/ash/assistant/ui/assistant_container_view_focus_traversable.cc
@@ -28,23 +28,17 @@ views::View* AssistantContainerViewFocusSearch::FindNextFocusableView(
     AnchoredDialogPolicy can_go_into_anchored_dialog,
     views::FocusTraversable** focus_traversable,
     views::View** focus_traversable_view) {
-  views::FocusManager* focus_manager =
-      assistant_container_view_->GetFocusManager();
-
-  // If there is no currently focused view we'll give AssistantContainerView
-  // an opportunity to explicitly specified which view to focus first.
-  views::View* next_focusable_view = nullptr;
-  if (focus_manager && !focus_manager->GetFocusedView())
-    next_focusable_view = assistant_container_view_->FindFirstFocusableView();
-
-  // When we are not explicitly overriding the next focusable view we defer
-  // back to views::FocusSearch's default behaviour.
-  return next_focusable_view
-             ? next_focusable_view
-             : views::FocusSearch::FindNextFocusableView(
-                   starting_from, search_direction, traversal_direction,
-                   check_starting_view, can_go_into_anchored_dialog,
-                   focus_traversable, focus_traversable_view);
+  // NOTE: This FocusTraversable should only be used whenever the container does
+  // not have anything currently focused *and* it has a reasonable default focus
+  // override via |FindFirstFocusableView()|. This is ensured by
+  // |AssistantContainerView::GetFocusTraversable()|.
+  DCHECK(!assistant_container_view_->GetFocusManager() ||
+         !assistant_container_view_->GetFocusManager()->GetFocusedView());
+
+  auto* next_focusable_view =
+      assistant_container_view_->FindFirstFocusableView();
+  DCHECK(next_focusable_view);
+  return next_focusable_view;
 }
 
 // AssistantContainerViewFocusTraversable --------------------------------------

diff --git a/ash/assistant/ui/assistant_web_view.cc b/ash/assistant/ui/assistant_web_view.cc
@@ -99,6 +99,16 @@ void AssistantWebView::ChildPreferredSizeChanged(views::View* child) {
   SchedulePaint();
 }
 
+void AssistantWebView::OnFocus() {
+  if (contents_)
+    contents_->Focus();
+}
+
+void AssistantWebView::AboutToRequestFocusFromTabTraversal(bool reverse) {
+  if (contents_)
+    contents_->FocusThroughTabTraversal(reverse);
+}
+
 void AssistantWebView::OnWindowBoundsChanged(aura::Window* window,
                                              const gfx::Rect& old_bounds,
                                              const gfx::Rect& new_bounds,
@@ -191,6 +201,7 @@ void AssistantWebView::DidAutoResizeView(const gfx::Size& new_size) {
 
 void AssistantWebView::DidStopLoading() {
   AddChildView(contents_->GetView()->view());
+  SetFocusBehavior(FocusBehavior::ALWAYS);
 
   gfx::NativeView native_view = contents_->GetView()->native_view();
 
@@ -239,6 +250,7 @@ void AssistantWebView::RemoveContents() {
   if (view)
     RemoveChildView(view);
 
+  SetFocusBehavior(FocusBehavior::NEVER);
   contents_->RemoveObserver(this);
   contents_.reset();
 }

diff --git a/ash/assistant/ui/assistant_web_view.h b/ash/assistant/ui/assistant_web_view.h
@@ -40,6 +40,8 @@ class AssistantWebView : public views::View,
   gfx::Size CalculatePreferredSize() const override;
   int GetHeightForWidth(int width) const override;
   void ChildPreferredSizeChanged(views::View* child) override;
+  void OnFocus() override;
+  void AboutToRequestFocusFromTabTraversal(bool reverse) override;
 
   // views::WindowObserver:
   void OnWindowBoundsChanged(aura::Window* window,

diff --git a/ash/assistant/ui/main_stage/assistant_card_element_view.cc b/ash/assistant/ui/main_stage/assistant_card_element_view.cc
@@ -88,6 +88,15 @@ void AssistantCardElementView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
+void AssistantCardElementView::AboutToRequestFocusFromTabTraversal(
+    bool reverse) {
+  contents_->FocusThroughTabTraversal(reverse);
+}
+
+void AssistantCardElementView::OnFocus() {
+  contents_->Focus();
+}
+
 void AssistantCardElementView::OnGestureEvent(ui::GestureEvent* event) {
   // We need to route GESTURE_TAP events to our Assistant card because links
   // should be tappable. The Assistant card window will not receive gesture
@@ -147,6 +156,7 @@ void AssistantCardElementView::DidSuppressNavigation(
 
 void AssistantCardElementView::InitLayout(
     const AssistantCardElement* card_element) {
+  SetFocusBehavior(FocusBehavior::ALWAYS);
   SetLayoutManager(std::make_unique<views::FillLayout>());
 
   // Contents view.

diff --git a/ash/assistant/ui/main_stage/assistant_card_element_view.h b/ash/assistant/ui/main_stage/assistant_card_element_view.h
@@ -28,6 +28,8 @@ class AssistantCardElementView : public views::View,
   const char* GetClassName() const override;
   void AddedToWidget() override;
   void ChildPreferredSizeChanged(views::View* child) override;
+  void AboutToRequestFocusFromTabTraversal(bool reverse) override;
+  void OnFocus() override;
   void OnGestureEvent(ui::GestureEvent* event) override;
 
   // content::NavigableContentsObserver:

diff --git a/ash/display/display_manager_unittest.cc b/ash/display/display_manager_unittest.cc
@@ -1891,6 +1891,41 @@ TEST_F(DisplayManagerTest, ResolutionFallback) {
   }
 }
 
+TEST_F(DisplayManagerTest, DisplayRemovedOnlyOnceWhenEnteringDockedMode) {
+  // Create two displays, one internal, and one external, such that the full ID
+  // of the internal display is *greater* than the full ID of the external
+  // display, but the port-index part (least significant 8-bit) of the ID of the
+  // internal display is *less* than the port-index part of the external
+  // display.
+  constexpr int64_t kInternalDisplayId = 0x4D10DBEBF24802LL;
+  constexpr int64_t kExternalDisplayId = 0x4CABEF61B95735LL;
+  const auto internal_info = display::ManagedDisplayInfo::CreateFromSpecWithID(
+      "0+0-400x400", kInternalDisplayId);
+  const auto external_info = display::ManagedDisplayInfo::CreateFromSpecWithID(
+      "401+0-600x600", kExternalDisplayId);
+  vector<display::ManagedDisplayInfo> display_info_list{internal_info,
+                                                        external_info};
+  display_manager()->OnNativeDisplaysChanged(display_info_list);
+  display::test::DisplayManagerTestApi(display_manager())
+      .SetFirstDisplayAsInternalDisplay();
+
+  // Switching to docked mode in this configuration should result in only a
+  // single display removal, and no new display additions.
+  // https://crbug.com/921275.
+  reset();
+  display_info_list.clear();
+  display_info_list.emplace_back(external_info);
+  display_manager()->OnNativeDisplaysChanged(display_info_list);
+
+  // There should only be 1 display change, 0 adds, and 1 removal.
+  EXPECT_EQ("1 0 1 1 1", GetCountSummary());
+  const unsigned int expected_changed_metrics =
+      display::DisplayObserver::DISPLAY_METRIC_BOUNDS |
+      display::DisplayObserver::DISPLAY_METRIC_WORK_AREA |
+      display::DisplayObserver::DISPLAY_METRIC_PRIMARY;
+  EXPECT_EQ(expected_changed_metrics, changed_metrics());
+}
+
 TEST_F(DisplayManagerTest, Rotate) {
   UpdateDisplay("100x200/r,300x400/l");
   EXPECT_EQ("1,1 100x200", GetDisplayInfoAt(0).bounds_in_native().ToString());

diff --git a/ash/public/cpp/ash_features.cc b/ash/public/cpp/ash_features.cc
@@ -47,7 +47,7 @@ const base::Feature kNotificationScrollBar{"NotificationScrollBar",
                                            base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kPipRoundedCorners{"PipRoundedCorners",
-                                       base::FEATURE_ENABLED_BY_DEFAULT};
+                                       base::FEATURE_DISABLED_BY_DEFAULT};
 
 const base::Feature kSeparateNetworkIcons{"SeparateNetworkIcons",
                                           base::FEATURE_DISABLED_BY_DEFAULT};

diff --git a/base/android/jni_generator/AndroidManifest.xml b/base/android/jni_generator/AndroidManifest.xml
@@ -7,7 +7,7 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.jni.generator">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
     <application></application>
 
 </manifest>
diff --git a/build/android/AndroidManifest.xml b/build/android/AndroidManifest.xml
@@ -15,6 +15,6 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="org.dummy">
 
-    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="24" />
+    <uses-sdk android:minSdkVersion="19" android:targetSdkVersion="24" />
 
 </manifest>
diff --git a/build/android/gradle/android.jinja b/build/android/gradle/android.jinja
@@ -52,7 +52,7 @@ android {
 
     defaultConfig {
         vectorDrawables.useSupportLibrary = true
-        minSdkVersion 16
+        minSdkVersion 19
         targetSdkVersion {{ target_sdk_version }}
     }
 

diff --git a/chrome/VERSION b/chrome/VERSION
@@ -1,4 +1,4 @@
 MAJOR=72
 MINOR=0
 BUILD=3626
-PATCH=73
+PATCH=81
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
@@ -63,7 +63,7 @@ jinja_template("chrome_public_android_manifest") {
   output = chrome_public_android_manifest
   variables = chrome_public_jinja_variables
   variables += [
-    "min_sdk_version=16",
+    "min_sdk_version=19",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -1462,7 +1462,7 @@ template("chrome_public_apk_or_module_tmpl") {
       android_manifest = chrome_modern_public_android_manifest
       android_manifest_dep = ":chrome_modern_public_android_manifest"
     } else {
-      min_sdk_version = 16
+      min_sdk_version = 19
       android_manifest = chrome_public_android_manifest
       android_manifest_dep = ":chrome_public_android_manifest"
     }
@@ -1666,7 +1666,7 @@ jinja_template("chrome_public_test_apk_manifest") {
   variables = default_chrome_public_jinja_variables
   variables += [
     "manifest_package=$test_manifest_package",
-    "min_sdk_version=16",
+    "min_sdk_version=19",
     "target_sdk_version=$android_sdk_version",
   ]
 }
@@ -1677,7 +1677,7 @@ jinja_template("chrome_public_test_vr_apk_manifest") {
   output = chrome_public_test_vr_apk_manifest
   variables = chrome_public_jinja_variables
   variables += [
-    "min_sdk_version=16",
+    "min_sdk_version=19",
     "target_sdk_version=$android_sdk_version",
   ]
 }

diff --git a/chrome/android/java/res/layout/autofill_local_card_editor.xml b/chrome/android/java/res/layout/autofill_local_card_editor.xml
@@ -19,7 +19,7 @@
 
         <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
         <EditText
-            tools:ignore="Autofill"
+            tools:ignore="Autofill,LabelFor"
             android:id="@+id/credit_card_name_edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -40,7 +40,7 @@
 
         <!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
         <EditText
-            tools:ignore="Autofill"
+            tools:ignore="Autofill,LabelFor"
             android:id="@+id/credit_card_number_edit"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
@@ -1511,6 +1511,8 @@ jumbo_split_static_library("browser") {
     "ssl/insecure_sensitive_input_driver_factory.h",
     "ssl/mitm_software_blocking_page.cc",
     "ssl/mitm_software_blocking_page.h",
+    "ssl/origin_util.cc",
+    "ssl/origin_util.h",
     "ssl/secure_origin_policy_handler.cc",
     "ssl/secure_origin_policy_handler.h",
     "ssl/security_state_tab_helper.cc",

diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -936,7 +936,6 @@ void ChromeBrowserMainPartsChromeos::PostProfileInit() {
       g_browser_process->local_state());
 
   g_browser_process->platform_part()->InitializeAutomaticRebootManager();
-  g_browser_process->platform_part()->InitializeDeviceDisablingManager();
   user_removal_manager::RemoveUsersIfNeeded();
 
   // This observer cannot be created earlier because it requires the shell to be

diff --git a/chrome/browser/chromeos/login/lock/screen_locker.cc b/chrome/browser/chromeos/login/lock/screen_locker.cc
@@ -216,6 +216,7 @@ void ScreenLocker::Init() {
     delegate_ = views_screen_locker_.get();
 
     // Create and display lock screen.
+    CHECK(LoginScreenClient::HasInstance());
     LoginScreenClient::Get()->login_screen()->ShowLockScreen(base::BindOnce(
         [](ViewsScreenLocker* screen_locker, bool did_show) {
           CHECK(did_show);
@@ -589,6 +590,12 @@ void ScreenLocker::Hide() {
   }));
 }
 
+void ScreenLocker::RefreshPinAndFingerprintTimeout() {
+  MaybeDisablePinAndFingerprintFromTimeout(
+      "RefreshPinAndFingerprintTimeout",
+      user_manager::UserManager::Get()->GetPrimaryUser()->GetAccountId());
+}
+
 // static
 void ScreenLocker::ScheduleDeletion() {
   // Avoid possible multiple calls.

diff --git a/chrome/browser/chromeos/login/lock/screen_locker.h b/chrome/browser/chromeos/login/lock/screen_locker.h
@@ -169,6 +169,8 @@ class ScreenLocker : public AuthStatusConsumer,
   // Hide the screen locker.
   static void Hide();
 
+  void RefreshPinAndFingerprintTimeout();
+
   // Saves sync password hash and salt to user profile prefs based on
   // |user_context|.
   void SaveSyncPasswordHash(const UserContext& user_context);

diff --git a/chrome/browser/chromeos/login/lock/webui_screen_locker.cc b/chrome/browser/chromeos/login/lock/webui_screen_locker.cc
@@ -350,6 +350,7 @@ void WebUIScreenLocker::SuspendDone(const base::TimeDelta& sleep_duration) {
   base::PostTaskWithTraits(FROM_HERE, {content::BrowserThread::UI},
                            base::BindOnce(&WebUIScreenLocker::FocusUserPod,
                                           weak_factory_.GetWeakPtr()));
+  screen_locker_->RefreshPinAndFingerprintTimeout();
 }
 
 void WebUIScreenLocker::RenderProcessGone(base::TerminationStatus status) {

diff --git a/chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.cc b/chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.cc
@@ -34,7 +34,7 @@ QuickUnlockStorage::QuickUnlockStorage(Profile* profile) : profile_(profile) {
 QuickUnlockStorage::~QuickUnlockStorage() {}
 
 void QuickUnlockStorage::MarkStrongAuth() {
-  last_strong_auth_ = base::TimeTicks::Now();
+  last_strong_auth_ = base::Time::Now();
   fingerprint_storage()->ResetUnlockAttemptCount();
   pin_storage_prefs()->ResetUnlockAttemptCount();
 }
@@ -47,7 +47,7 @@ bool QuickUnlockStorage::HasStrongAuth() const {
 
 base::TimeDelta QuickUnlockStorage::TimeSinceLastStrongAuth() const {
   DCHECK(!last_strong_auth_.is_null());
-  return base::TimeTicks::Now() - last_strong_auth_;
+  return base::Time::Now() - last_strong_auth_;
 }
 
 base::TimeDelta QuickUnlockStorage::TimeUntilNextStrongAuth() const {

diff --git a/chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h b/chrome/browser/chromeos/login/quick_unlock/quick_unlock_storage.h
@@ -90,7 +90,7 @@ class QuickUnlockStorage : public KeyedService {
   void Shutdown() override;
 
   Profile* const profile_;
-  base::TimeTicks last_strong_auth_;
+  base::Time last_strong_auth_;
   std::unique_ptr<FingerprintStorage> fingerprint_storage_;
   std::unique_ptr<PinStoragePrefs> pin_storage_prefs_;
   std::unique_ptr<AuthToken> auth_token_;