Update //build to m114.0.5735.331.

b/313662336

Change-Id: Icd93ee5afedb60c66cb1ca9277b63c17380faee9

base/debug/stack_trace.cc

@@ -82,7 +82,7 @@ bool IsStackFrameValid(uintptr_t fp, uintptr_t prev_fp, uintptr_t stack_end) {
   }
 
   return true;
-};
+}
 
 // ScanStackForNextFrame() scans the stack for a valid frame to allow unwinding
 // past system libraries. Only supported on Linux where system libraries are

base/debug/stack_trace_starboard.cc

@@ -165,7 +165,7 @@ StackTrace::StackTrace(size_t count) {
 
   // We can remove this call from the stack trace, since we know it is always
   // going to be in it.
-  for (int i = 1; i < count_; ++i) {
+  for (unsigned int i = 1; i < count_; ++i) {
     trace_[i - 1] = trace_[i];
   }
 }

base/feature_list.cc

@@ -113,10 +113,10 @@ void FeatureList::InitializeFromSharedMemory(
     if (!entry->GetFeatureAndTrialName(&feature_name, &trial_name))
       continue;
 
-    FieldTrial* trial = FieldTrialList::Find(trial_name.as_string());
 #if defined(STARBOARD)
     RegisterOverride(feature_name, override_state);
 #else
+    FieldTrial* trial = FieldTrialList::Find(trial_name.as_string());
     RegisterOverride(feature_name, override_state, trial);
 #endif
   }

base/files/file_starboard.cc

@@ -291,7 +291,6 @@ File::Error File::OSErrorToFileError(SbSystemError sb_error) {
     case kSbFileErrorIO:
       // Starboard error codes are designed to match Chromium's exactly.
       return static_cast<File::Error>(sb_error);
-      break;
     default:
       NOTREACHED() << "Unrecognized SbFileError: " << sb_error;
       break;

base/files/important_file_writer.cc

@@ -87,6 +87,7 @@ void UmaHistogramTimesWithSuffix(const char* histogram_name,
   UmaHistogramTimes(histogram_full_name, sample);
 }
 
+#if !defined(STARBOARD)
 void LogFailure(const FilePath& path,
                 StringPiece histogram_suffix,
                 TempFileFailure failure_code,
@@ -96,6 +97,7 @@ void LogFailure(const FilePath& path,
                                     TEMP_FILE_FAILURE_MAX);
   DPLOG(WARNING) << "temp file failure: " << path.value() << " : " << message;
 }
+#endif
 
 // Helper function to call WriteFileAtomically() with a
 // std::unique_ptr<std::string>.
@@ -120,6 +122,7 @@ void WriteScopedStringToFileAtomically(
     after_write_callback.Run(result);
 }
 
+#if !defined(STARBOARD)
 void DeleteTmpFile(const FilePath& tmp_file_path,
                    StringPiece histogram_suffix) {
   if (!DeleteFile(tmp_file_path, false)) {
@@ -128,6 +131,7 @@ void DeleteTmpFile(const FilePath& tmp_file_path,
         -base::File::GetLastFileError(), -base::File::FILE_ERROR_MAX);
   }
 }
+#endif
 
 }  // namespace
 

base/logging.cc

@@ -191,10 +191,8 @@ LogMessageHandlerFunction log_message_handler = nullptr;
 
 // Helper functions to wrap platform differences.
 
+#if !defined(STARBOARD)
 int32_t CurrentProcessId() {
-#if defined(STARBOARD)
-  return 0;
-#else
 #if defined(OS_WIN)
   return GetCurrentProcessId();
 #elif defined(OS_FUCHSIA)
@@ -205,13 +203,11 @@ int32_t CurrentProcessId() {
 #elif defined(OS_POSIX)
   return getpid();
 #endif
-#endif
 }
+#endif
 
+#if !defined(STARBOARD)
 uint64_t TickCount() {
-#if defined(STARBOARD)
-  return starboard::CurrentMonotonicTime();
-#else
 #if defined(OS_WIN)
   return GetTickCount();
 #elif defined(OS_FUCHSIA)
@@ -232,8 +228,8 @@ uint64_t TickCount() {
 
   return absolute_micro;
 #endif
-#endif
 }
+#endif  // !defined(STARBOARD)
 
 void DeleteFilePath(const PathString& log_name) {
 #if defined(STARBOARD)
@@ -945,7 +941,7 @@ LogMessage::~LogMessage() {
     if (InitializeLogFileHandle()) {
 #if defined(STARBOARD)
       SbFileSeek(g_log_file, kSbFileFromEnd, 0);
-      int written = 0;
+      unsigned int written = 0;
       while (written < str_newline.length()) {
         int result = SbFileWrite(g_log_file, &(str_newline.c_str()[written]),
                                  str_newline.length() - written);

base/logging.h

@@ -527,7 +527,7 @@ bool LogOnceHelper<FILE_HASH, LINE>::logged_ = false;
 #define PLOG_STREAM(severity) \
   COMPACT_GOOGLE_LOG_EX_ ## severity(StarboardErrorLogMessage, \
       ::logging::GetLastSystemErrorCode()).stream()
-#if defined(OS_WIN)
+#elif defined(OS_WIN)
 #define PLOG_STREAM(severity) \
   COMPACT_GOOGLE_LOG_EX_ ## severity(Win32ErrorLogMessage, \
       ::logging::GetLastSystemErrorCode()).stream()
@@ -536,7 +536,6 @@ bool LogOnceHelper<FILE_HASH, LINE>::logged_ = false;
   COMPACT_GOOGLE_LOG_EX_ ## severity(ErrnoLogMessage, \
       ::logging::GetLastSystemErrorCode()).stream()
 #endif
-#endif
 
 #define PLOG(severity)                                          \
   LAZY_STREAM(PLOG_STREAM(severity), LOG_IS_ON(severity))

base/metrics/field_trial.cc

@@ -59,6 +59,7 @@ const bool kUseSharedMemoryForFieldTrials = false;
 const bool kUseSharedMemoryForFieldTrials = true;
 #endif
 
+#if !defined(STARBOARD)
 // Constants for the field trial allocator.
 const char kAllocatorName[] = "FieldTrialAllocator";
 
@@ -70,6 +71,7 @@ const char kAllocatorName[] = "FieldTrialAllocator";
 // child processes, leading to an inconsistent view between browser and child
 // processes and possibly causing crashes (see crbug.com/661617).
 const size_t kFieldTrialAllocationSize = 128 << 10;  // 128 KiB
+#endif
 
 // Writes out string1 and then string2 to pickle.
 void WriteStringPair(Pickle* pickle,
@@ -209,13 +211,15 @@ void AddFeatureAndFieldTrialFlags(const char* enable_features_switch,
   }
 }
 
+#if !defined(STARBOARD)
 void OnOutOfMemory(size_t size) {
 #if defined(OS_NACL)
   NOTREACHED();
 #else
   TerminateBecauseOutOfMemory(size);
 #endif
 }
+#endif
 
 #if !defined(OS_NACL) && !defined(STARBOARD)
 // Returns whether the operation succeeded.

base/metrics/persistent_histogram_allocator.cc

@@ -928,7 +928,7 @@ GlobalHistogramAllocator::ReleaseForTesting() {
 
   subtle::Release_Store(&g_histogram_allocator, 0);
   return WrapUnique(histogram_allocator);
-};
+}
 
 void GlobalHistogramAllocator::SetPersistentLocation(const FilePath& location) {
   persistent_location_ = location;

base/metrics/persistent_histogram_storage.cc

@@ -96,7 +96,7 @@ PersistentHistogramStorage::~PersistentHistogramStorage() {
                        allocator->used());
 #if defined(STARBOARD)
   int bytes_written = base::WriteFile(file_path, contents.data(), contents.size());
-  if (bytes_written == contents.size()) {
+  if (bytes_written == static_cast<int>(contents.size())) {
 #else
   if (!ImportantFileWriter::WriteFileAtomically(file_path, contents)) {
 #endif

base/numerics/clamped_math.h

@@ -232,12 +232,12 @@ BASE_NUMERIC_ARITHMETIC_OPERATORS(Clamped, Clamp, Or, |, |=)
 BASE_NUMERIC_ARITHMETIC_OPERATORS(Clamped, Clamp, Xor, ^, ^=)
 BASE_NUMERIC_ARITHMETIC_VARIADIC(Clamped, Clamp, Max)
 BASE_NUMERIC_ARITHMETIC_VARIADIC(Clamped, Clamp, Min)
-BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsLess, <);
-BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsLessOrEqual, <=);
-BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsGreater, >);
-BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsGreaterOrEqual, >=);
-BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsEqual, ==);
-BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsNotEqual, !=);
+BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsLess, <)
+BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsLessOrEqual, <=)
+BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsGreater, >)
+BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsGreaterOrEqual, >=)
+BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsEqual, ==)
+BASE_NUMERIC_COMPARISON_OPERATORS(Clamped, IsNotEqual, !=)
 
 }  // namespace internal
 

base/numerics/safe_conversions.h

@@ -315,14 +315,14 @@ std::ostream& operator<<(std::ostream& os, const StrictNumeric<T>& value) {
                        typename UnderlyingType<R>::type>(lhs, rhs);     \
   }
 
-BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsLess, <);
-BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsLessOrEqual, <=);
-BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsGreater, >);
-BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsGreaterOrEqual, >=);
-BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsEqual, ==);
-BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsNotEqual, !=);
-
-};  // namespace internal
+BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsLess, <)
+BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsLessOrEqual, <=)
+BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsGreater, >)
+BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsGreaterOrEqual, >=)
+BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsEqual, ==)
+BASE_NUMERIC_COMPARISON_OPERATORS(Strict, IsNotEqual, !=)
+
+}  // namespace internal
 
 using internal::as_signed;
 using internal::as_unsigned;

base/power_monitor/power_observer.h

@@ -14,7 +14,7 @@ class BASE_EXPORT PowerObserver {
  public:
   // Notification of a change in power status of the computer, such
   // as from switching between battery and A/C power.
-  virtual void OnPowerStateChange(bool on_battery_power){};
+  virtual void OnPowerStateChange(bool on_battery_power){}
 
   // Notification that the system is suspending.
   virtual void OnSuspend() {}

base/process/process_handle.cc

@@ -10,19 +10,23 @@
 namespace base {
 
 namespace {
+#if !defined(STARBOARD)
 bool g_have_unique_id = false;
 uint32_t g_unique_id;
 
 // The process which set |g_unique_id|.
 ProcessId g_procid;
+#endif
 
+#if !defined(STARBOARD)
 // Mangle IDs so that they are not accidentally used as PIDs, e.g. as an
 // argument to kill or waitpid.
 uint32_t MangleProcessId(ProcessId process_id) {
   // Add a large power of 10 so that the pid is still the pid is still readable
   // inside the mangled id.
   return static_cast<uint32_t>(process_id) + 1000000000U;
 }
+#endif  // !defined(STARBOARD)
 
 }  // namespace
 

base/strings/safe_sprintf.cc

@@ -491,7 +491,6 @@ ssize_t SafeSNPrintf(char* buf, size_t sz, const char* fmt, const Arg* args,
             goto format_character_found;
           }
         }
-        break;
       case 'c': {  // Output an ASCII character.
         // Check that there are arguments left to be inserted.
         if (cur_arg >= max_args) {

base/task/task_scheduler/scheduler_worker_pool_impl.cc

@@ -43,12 +43,14 @@ constexpr TimeDelta SchedulerWorkerPoolImpl::kBlockedWorkersPollPeriod;
 namespace {
 
 constexpr char kPoolNameSuffix[] = "Pool";
+#if !defined(STARBOARD)
 constexpr char kDetachDurationHistogramPrefix[] =
     "TaskScheduler.DetachDuration.";
 constexpr char kNumTasksBeforeDetachHistogramPrefix[] =
     "TaskScheduler.NumTasksBeforeDetach.";
 constexpr char kNumTasksBetweenWaitsHistogramPrefix[] =
     "TaskScheduler.NumTasksBetweenWaits.";
+#endif
 constexpr char kNumThreadsHistogramPrefix[] = "TaskScheduler.NumWorkers.";
 #ifdef STARBOARD
 const size_t kMaxNumberOfWorkers = kSbMaxThreads;

base/task/task_scheduler/sequence_sort_key.h

@@ -31,7 +31,7 @@ class BASE_EXPORT SequenceSortKey final {
   }
   bool operator!=(const SequenceSortKey& other) const {
     return !(other == *this);
-  };
+  }
 
  private:
   // The private section allows this class to keep its immutable property while

base/trace_event/memory_allocator_dump.cc

@@ -102,7 +102,7 @@ uint64_t MemoryAllocatorDump::GetSizeInternal() const {
     }
   }
   return 0;
-};
+}
 
 MemoryAllocatorDump::Entry::Entry() : entry_type(kString), value_uint64() {}
 MemoryAllocatorDump::Entry::Entry(MemoryAllocatorDump::Entry&&) noexcept =

base/trace_event/process_memory_dump.cc

@@ -98,7 +98,9 @@ size_t ProcessMemoryDump::CountResidentBytes(void* start_address,
   const size_t kMaxChunkSize = 8 * 1024 * 1024;
   size_t max_vec_size =
       GetSystemPageCount(std::min(mapped_size, kMaxChunkSize), page_size);
-#if defined(OS_WIN)
+#if defined(STARBOARD)
+  ALLOW_UNUSED_LOCAL(max_vec_size);
+#elif defined(OS_WIN)
   std::unique_ptr<PSAPI_WORKING_SET_EX_INFORMATION[]> vec(
       new PSAPI_WORKING_SET_EX_INFORMATION[max_vec_size]);
 #elif defined(OS_MACOSX)
@@ -112,6 +114,10 @@ size_t ProcessMemoryDump::CountResidentBytes(void* start_address,
     const size_t chunk_size = std::min(mapped_size - offset, kMaxChunkSize);
     const size_t page_count = GetSystemPageCount(chunk_size, page_size);
     size_t resident_page_count = 0;
+#if defined(STARBOARD)
+    ALLOW_UNUSED_LOCAL(chunk_start);
+    ALLOW_UNUSED_LOCAL(page_count);
+#endif
 #if defined(OS_WIN)
     for (size_t i = 0; i < page_count; i++) {
       vec[i].VirtualAddress =

base/trace_event/process_memory_dump.h

@@ -241,7 +241,7 @@ class BASE_EXPORT ProcessMemoryDump {
   const UnguessableToken& process_token() const { return process_token_; }
   void set_process_token_for_testing(UnguessableToken token) {
     process_token_ = token;
-  };
+  }
 
   // Returns the Guid of the dump for the given |absolute_name| for
   // for the given process' token. |process_token| is used to disambiguate GUIDs

base/trace_event/trace_config.cc

@@ -34,6 +34,7 @@ const char kTraceBufferSizeInEvents[] = "trace_buffer_size_in_events";
 const char kEnableSystraceParam[] = "enable_systrace";
 const char kEnableArgumentFilterParam[] = "enable_argument_filter";
 
+#if !defined(STARBOARD)
 // String parameters that is used to parse memory dump config in trace config
 // string.
 const char kMemoryDumpConfigParam[] = "memory_dump_config";
@@ -45,6 +46,7 @@ const char kTriggerTypeParam[] = "type";
 const char kPeriodicIntervalLegacyParam[] = "periodic_interval_ms";
 const char kHeapProfilerOptions[] = "heap_profiler_options";
 const char kBreakdownThresholdBytes[] = "breakdown_threshold_bytes";
+#endif
 
 // String parameters used to parse category event filters.
 const char kEventFiltersParam[] = "event_filters";
@@ -70,6 +72,7 @@ class ConvertableTraceConfigToTraceFormat
   const TraceConfig trace_config_;
 };
 
+#if !defined(STARBOARD)
 std::set<MemoryDumpLevelOfDetail> GetDefaultAllowedMemoryDumpModes() {
   std::set<MemoryDumpLevelOfDetail> all_modes;
   for (uint32_t mode = static_cast<uint32_t>(MemoryDumpLevelOfDetail::FIRST);
@@ -78,6 +81,7 @@ std::set<MemoryDumpLevelOfDetail> GetDefaultAllowedMemoryDumpModes() {
   }
   return all_modes;
 }
+#endif
 
 }  // namespace
 

base/trace_event/trace_event_impl.h

@@ -49,7 +49,7 @@ class BASE_EXPORT ConvertableToTraceFormat {
   virtual void AppendAsTraceFormat(std::string* out) const = 0;
 
   virtual void EstimateTraceMemoryOverhead(
-      TraceEventMemoryOverhead* overhead){};
+      TraceEventMemoryOverhead* overhead){}
 
   std::string ToString() const {
     std::string result;

base/trace_event/trace_event_memory_overhead.cc

@@ -19,6 +19,7 @@ namespace trace_event {
 
 namespace {
 
+#if !defined(STARBOARD)
 const char* ObjectTypeToString(TraceEventMemoryOverhead::ObjectType type) {
   switch (type) {
     case TraceEventMemoryOverhead::kOther:
@@ -55,6 +56,7 @@ const char* ObjectTypeToString(TraceEventMemoryOverhead::ObjectType type) {
   NOTREACHED();
   return "BUG";
 }
+#endif
 
 }  // namespace
 

build/.gitignore

@@ -5,6 +5,7 @@ ciopfs
 /android/bin
 /android/binary_size/apks/**/*.apk
 /args/chromeos/*.gni
+/args/chromeos/rewrapper*
 /config/gclient_args.gni
 /cros_cache/
 /Debug