Always create safe browsing specific directory in WebView.

android_webview/browser/aw_browser_main_parts.cc

 // Copyright (c) 2012 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 "android_webview/browser/aw_browser_main_parts.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_terminator.h"
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_metrics_service_client.h"
 #include "android_webview/browser/aw_result_codes.h"
-#include "android_webview/browser/aw_safe_browsing_config_helper.h"
 #include "android_webview/browser/deferred_gpu_command_service.h"
 #include "android_webview/browser/net/aw_network_change_notifier_factory.h"
 #include "android_webview/common/aw_descriptors.h"
 #include "android_webview/common/aw_paths.h"
 #include "android_webview/common/aw_resource.h"
 #include "android_webview/common/aw_switches.h"
 #include "android_webview/common/crash_reporter/aw_microdump_crash_reporter.h"
 #include "base/android/apk_assets.h"
 #include "base/android/build_info.h"
 #include "base/android/locale_utils.h"
@@ skipping 105 matching lines @@
     base::FilePath crash_dir;
     if (PathService::Get(android_webview::DIR_CRASH_DUMPS, &crash_dir)) {
       if (!base::PathExists(crash_dir))
         base::CreateDirectory(crash_dir);
       breakpad::CrashDumpObserver::GetInstance()->RegisterClient(
           base::MakeUnique<breakpad::CrashDumpManager>(
               crash_dir, kAndroidMinidumpDescriptor));
     }
   }
 
-  if (AwSafeBrowsingConfigHelper::GetSafeBrowsingEnabled()) {
-    base::FilePath safe_browsing_dir;
-    if (PathService::Get(android_webview::DIR_SAFE_BROWSING,
-                         &safe_browsing_dir)) {
-      if (!base::PathExists(safe_browsing_dir))
-        base::CreateDirectory(safe_browsing_dir);
-    }
+  // We need to create the safe browsing specific directory even if the
+  // AwSafeBrowsingConfigHelper::GetSafeBrowsingEnabled() is false
+  // initially, because safe browsing can be enabled later at runtime
+  // on a per-webview basis.
+  base::FilePath safe_browsing_dir;
+  if (PathService::Get(android_webview::DIR_SAFE_BROWSING,
+                       &safe_browsing_dir)) {
+    if (!base::PathExists(safe_browsing_dir))
+      base::CreateDirectory(safe_browsing_dir);
   }
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kWebViewSandboxedRenderer)) {
     // Create the renderers crash manager on the UI thread.
     breakpad::CrashDumpObserver::GetInstance()->RegisterClient(
         base::MakeUnique<AwBrowserTerminator>());
   }
 
   if (base::CommandLine::ForCurrentProcess()->HasSwitch(
@@ skipping 13 matching lines @@
   content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
 }
 
 bool AwBrowserMainParts::MainMessageLoopRun(int* result_code) {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop.
   return true;
 }
 
 }  // namespace android_webview