BASELINE: Update Chromium to 65.0.3525.40

Also imports missing submodules

Change-Id: I36901b7c6a325cda3d2c10cedb2186c25af3b79b
Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>

1 files changed, 14 insertions, 6 deletions

diff --git a/chromium/content/browser/appcache/appcache_group.h b/chromium/content/browser/appcache/appcache_group.h
index c9ee22ee03e..beb00e3f2a8 100644
--- a/chromium/content/browser/appcache/appcache_group.h
+++ b/chromium/content/browser/appcache/appcache_group.h
@@ -22,16 +22,20 @@
 #include "url/gurl.h"
 
 namespace content {
+
+namespace appcache_update_job_unittest {
+class AppCacheUpdateJobTest;
+FORWARD_DECLARE_TEST(AppCacheUpdateJobTest, AlreadyChecking);
+FORWARD_DECLARE_TEST(AppCacheUpdateJobTest, AlreadyDownloading);
+}  // namespace appcache_update_job_unittest
+
 FORWARD_DECLARE_TEST(AppCacheGroupTest, StartUpdate);
 FORWARD_DECLARE_TEST(AppCacheGroupTest, CancelUpdate);
 FORWARD_DECLARE_TEST(AppCacheGroupTest, QueueUpdate);
-FORWARD_DECLARE_TEST(AppCacheUpdateJobTest, AlreadyChecking);
-FORWARD_DECLARE_TEST(AppCacheUpdateJobTest, AlreadyDownloading);
 class AppCache;
 class AppCacheHost;
 class AppCacheStorage;
 class AppCacheUpdateJob;
-class AppCacheUpdateJobTest;
 class HostObserver;
 class MockAppCacheStorage;
 
@@ -117,7 +121,7 @@ class CONTENT_EXPORT AppCacheGroup
   class HostObserver;
 
   friend class base::RefCounted<AppCacheGroup>;
-  friend class content::AppCacheUpdateJobTest;
+  friend class content::appcache_update_job_unittest::AppCacheUpdateJobTest;
   friend class content::MockAppCacheStorage;  // for old_caches()
   friend class AppCacheUpdateJob;
 
@@ -189,8 +193,12 @@ class CONTENT_EXPORT AppCacheGroup
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, StartUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, CancelUpdate);
   FRIEND_TEST_ALL_PREFIXES(content::AppCacheGroupTest, QueueUpdate);
-  FRIEND_TEST_ALL_PREFIXES(content::AppCacheUpdateJobTest, AlreadyChecking);
-  FRIEND_TEST_ALL_PREFIXES(content::AppCacheUpdateJobTest, AlreadyDownloading);
+  FRIEND_TEST_ALL_PREFIXES(
+      content::appcache_update_job_unittest::AppCacheUpdateJobTest,
+      AlreadyChecking);
+  FRIEND_TEST_ALL_PREFIXES(
+      content::appcache_update_job_unittest::AppCacheUpdateJobTest,
+      AlreadyDownloading);
 
   DISALLOW_COPY_AND_ASSIGN(AppCacheGroup);
 };