miscellaneous errors

brave · Jan 3, 2018 · 65c2088 · 65c2088
1 parent daf8b3c
commit 65c2088
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/app/brave_main_delegate.cc b/app/brave_main_delegate.cc
@@ -16,6 +16,8 @@ base::LazyInstance<BraveContentRendererClient>::DestructorAtExit
     g_brave_content_renderer_client = LAZY_INSTANCE_INITIALIZER;
 base::LazyInstance<BraveContentUtilityClient>::DestructorAtExit
     g_brave_content_utility_client = LAZY_INSTANCE_INITIALIZER;
+#endif
+#if !defined(CHROME_MULTIPLE_DLL_CHILD)
 base::LazyInstance<BraveContentBrowserClient>::DestructorAtExit
     g_brave_content_browser_client = LAZY_INSTANCE_INITIALIZER;
 #endif

diff --git a/components/brave_shields/browser/dat_file_util.cc b/components/brave_shields/browser/dat_file_util.cc
@@ -14,7 +14,7 @@ namespace brave_shields {
 base::FilePath GetDATFilePath(const std::string& file_name) {
   base::FilePath app_data_path;
   PathService::Get(chrome::DIR_USER_DATA, &app_data_path);
-  base::FilePath dat_file_path = app_data_path.Append(file_name);
+  base::FilePath dat_file_path = app_data_path.AppendASCII(file_name);
   return dat_file_path;
 }
 

diff --git a/components/brave_shields/browser/https_everywhere_service.cc b/components/brave_shields/browser/https_everywhere_service.cc
@@ -102,7 +102,7 @@ bool HTTPSEverywhereService::Init() {
 
   leveldb::Options options;
   leveldb::Status status = leveldb::DB::Open(options,
-      unzipped_level_db_path.value().c_str(),
+      unzipped_level_db_path.AsUTF8Unsafe(),
       &level_db_);
   if (!status.ok() || !level_db_) {
     if (level_db_) {