linux

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@56576 954022d7-b5bf-4e40-9824-e11837661b57

DesktopEditor/clipboard/linux/clipboard_test/clipboard_test.pro

@@ -114,7 +114,20 @@ SOURCES += main.cpp \
     ../../src/ui/gfx/vector2d.cc \
     ../../src/ui/gfx/vector2d_conversions.cc \
     ../../src/ui/gfx/vector2d_f.cc \
-    ../../src/ui/gfx/vector3d_f.cc
+    ../../src/ui/gfx/vector3d_f.cc \
+    ../../src/base/third_party/nspr/prtime.cc \
+    ../../src/base/values.cc \
+    ../../src/base/metrics/bucket_ranges.cc \
+    ../../src/base/metrics/sample_vector.cc \
+    ../../src/base/metrics/histogram_samples.cc \
+    ../../src/base/synchronization/cancellation_flag.cc \
+    ../../src/base/strings/string_split.cc \
+    ../../src/base/process_util.cc \
+    ../../src/base/process_util_linux.cc \
+    ../../src/base/process_util_posix.cc \
+    ../../src/base/files/file_path.cc \
+    ../../src/ui/gfx/insets.cc \
+    ../../src/ui/gfx/insets_f.cc
 
 
 HEADERS += \
@@ -207,4 +220,20 @@ HEADERS += \
     ../../src/ui/gfx/vector2d.h \
     ../../src/ui/gfx/vector2d_conversions.h \
     ../../src/ui/gfx/vector2d_f.h \
-    ../../src/ui/gfx/vector3d_f.h
+    ../../src/ui/gfx/vector3d_f.h \
+    ../../src/ui/gfx/rect_base_impl.h \
+    ../../src/base/third_party/nspr/prcpucfg.h \
+    ../../src/base/third_party/nspr/prcpucfg_linux.h \
+    ../../src/base/third_party/nspr/prtime.h \
+    ../../src/base/third_party/nspr/prtypes.h \
+    ../../src/base/values.h \
+    ../../src/base/metrics/bucket_ranges.h \
+    ../../src/base/metrics/sample_vector.h \
+    ../../src/base/metrics/histogram_samples.h \
+    ../../src/base/synchronization/cancellation_flag.h \
+    ../../src/base/strings/string_split.h \
+    ../../src/base/process_util.h \
+    ../../src/base/files/file_path.h \
+    ../../src/ui/gfx/insets.h \
+    ../../src/ui/gfx/insets_base.h \
+    ../../src/ui/gfx/insets_f.h

DesktopEditor/clipboard/src/base/allocator/type_profiler_control.h

@@ -16,8 +16,8 @@ class Controller {
   static bool IsProfiling();
 
  private:
-  FRIEND_TEST_ALL_PREFIXES(TypeProfilerTest,
-                           TestProfileNewWithoutProfiledDelete);
+  //FRIEND_TEST_ALL_PREFIXES(TypeProfilerTest,
+  //                         TestProfileNewWithoutProfiledDelete);
 
   // It must be used only from allowed unit tests.  The following is only
   // allowed for use in unit tests. Profiling should never be restarted in

DesktopEditor/clipboard/src/base/file_util.h

@@ -414,7 +414,9 @@ class ScopedFDClose {
   inline void operator()(int* x) const {
     if (x && *x >= 0) {
       if (HANDLE_EINTR(close(*x)) < 0)
-        DPLOG(ERROR) << "close";
+      {
+        //DPLOG(ERROR) << "close";
+      }
     }
   }
 };

DesktopEditor/clipboard/src/base/files/dir_reader_linux.h

@@ -38,7 +38,9 @@ class DirReaderLinux {
   ~DirReaderLinux() {
     if (fd_ >= 0) {
       if (HANDLE_EINTR(close(fd_)))
-        RAW_LOG(ERROR, "Failed to close directory handle");
+      {
+      //  RAW_LOG(ERROR, "Failed to close directory handle");
+      }
     }
   }
 
@@ -60,7 +62,7 @@ class DirReaderLinux {
     if (r == 0)
       return false;
     if (r == -1) {
-      DPLOG(FATAL) << "getdents64 returned an error: " << errno;
+      //DPLOG(FATAL) << "getdents64 returned an error: " << errno;
       return false;
     }
     size_ = r;

DesktopEditor/clipboard/src/base/files/file_path.cc

@@ -227,7 +227,7 @@ bool FilePath::IsSeparator(CharType character) {
 }
 
 void FilePath::GetComponents(std::vector<StringType>* components) const {
-  DCHECK(components);
+  //DCHECK(components);
   if (!components)
     return;
   components->clear();
@@ -408,7 +408,7 @@ FilePath FilePath::InsertBeforeExtension(const StringType& suffix) const {
 
 FilePath FilePath::InsertBeforeExtensionASCII(const StringPiece& suffix)
     const {
-  DCHECK(IsStringASCII(suffix));
+  //DCHECK(IsStringASCII(suffix));
 #if defined(OS_WIN)
   return InsertBeforeExtension(ASCIIToUTF16(suffix.as_string()));
 #elif defined(OS_POSIX)
@@ -450,7 +450,7 @@ FilePath FilePath::ReplaceExtension(const StringType& extension) const {
 }
 
 bool FilePath::MatchesExtension(const StringType& extension) const {
-  DCHECK(extension.empty() || extension[0] == kExtensionSeparator);
+  //DCHECK(extension.empty() || extension[0] == kExtensionSeparator);
 
   StringType current_extension = Extension();
 
@@ -470,7 +470,7 @@ FilePath FilePath::Append(const StringType& component) const {
     appended = &without_nuls;
   }
 
-  DCHECK(!IsPathAbsolute(*appended));
+  //DCHECK(!IsPathAbsolute(*appended));
 
   if (path_.compare(kCurrentDirectory) == 0) {
     // Append normally doesn't do any normalization, but as a special case,
@@ -509,7 +509,7 @@ FilePath FilePath::Append(const FilePath& component) const {
 }
 
 FilePath FilePath::AppendASCII(const StringPiece& component) const {
-  DCHECK(IsStringASCII(component));
+  //DCHECK(IsStringASCII(component));
 #if defined(OS_WIN)
   return Append(ASCIIToUTF16(component.as_string()));
 #elif defined(OS_POSIX)

DesktopEditor/clipboard/src/base/metrics/bucket_ranges.cc

@@ -86,7 +86,7 @@ static uint32 Crc32(uint32 sum, HistogramBase::Sample value) {
       HistogramBase::Sample range;
       uint16 ints[sizeof(HistogramBase::Sample) / 2];
     } converter;
-    DCHECK_EQ(sizeof(HistogramBase::Sample), sizeof(converter));
+    //DCHECK_EQ(sizeof(HistogramBase::Sample), sizeof(converter));
     converter.range = value;
     sum += converter.ints[0];
     sum = (sum << 16) ^ sum ^ (static_cast<uint32>(converter.ints[1]) << 11);
@@ -102,8 +102,8 @@ BucketRanges::BucketRanges(size_t num_ranges)
 BucketRanges::~BucketRanges() {}
 
 void BucketRanges::set_range(size_t i, HistogramBase::Sample value) {
-  DCHECK_LT(i, ranges_.size());
-  CHECK_GE(value, 0);
+  //DCHECK_LT(i, ranges_.size());
+  //CHECK_GE(value, 0);
   ranges_[i] = value;
 }
 

DesktopEditor/clipboard/src/base/metrics/histogram_samples.cc

@@ -40,7 +40,7 @@ bool SampleCountPickleIterator::Done() const {
 }
 
 void SampleCountPickleIterator::Next() {
-  DCHECK(!Done());
+  //DCHECK(!Done());
   if (!iter_->ReadInt(&min_) ||
       !iter_->ReadInt(&max_) ||
       !iter_->ReadInt(&count_))
@@ -50,7 +50,7 @@ void SampleCountPickleIterator::Next() {
 void SampleCountPickleIterator::Get(HistogramBase::Sample* min,
                                     HistogramBase::Sample* max,
                                     HistogramBase::Count* count) const {
-  DCHECK(!Done());
+  //DCHECK(!Done());
   *min = min_;
   *max = max_;
   *count = count_;
@@ -66,7 +66,7 @@ void HistogramSamples::Add(const HistogramSamples& other) {
   sum_ += other.sum();
   redundant_count_ += other.redundant_count();
   bool success = AddSubtractImpl(other.Iterator().get(), ADD);
-  DCHECK(success);
+  //DCHECK(success);
 }
 
 bool HistogramSamples::AddFromPickle(PickleIterator* iter) {
@@ -86,7 +86,7 @@ void HistogramSamples::Subtract(const HistogramSamples& other) {
   sum_ -= other.sum();
   redundant_count_ -= other.redundant_count();
   bool success = AddSubtractImpl(other.Iterator().get(), SUBTRACT);
-  DCHECK(success);
+  //DCHECK(success);
 }
 
 bool HistogramSamples::Serialize(Pickle* pickle) const {
@@ -119,7 +119,7 @@ void HistogramSamples::IncreaseRedundantCount(HistogramBase::Count diff) {
 SampleCountIterator::~SampleCountIterator() {}
 
 bool SampleCountIterator::GetBucketIndex(size_t* index) const {
-  DCHECK(!Done());
+  //DCHECK(!Done());
   return false;
 }
 

DesktopEditor/clipboard/src/base/metrics/sample_vector.cc

@@ -17,7 +17,7 @@ typedef HistogramBase::Sample Sample;
 SampleVector::SampleVector(const BucketRanges* bucket_ranges)
     : counts_(bucket_ranges->size() - 1),
       bucket_ranges_(bucket_ranges) {
-  CHECK_GE(bucket_ranges_->size(), 2u);
+  //CHECK_GE(bucket_ranges_->size(), 2u);
 }
 
 SampleVector::~SampleVector() {}
@@ -43,7 +43,7 @@ Count SampleVector::TotalCount() const {
 }
 
 Count SampleVector::GetCountAtIndex(size_t bucket_index) const {
-  DCHECK(bucket_index < counts_.size());
+  //DCHECK(bucket_index < counts_.size());
   return counts_[bucket_index];
 }
 
@@ -84,15 +84,15 @@ bool SampleVector::AddSubtractImpl(SampleCountIterator* iter,
 // approaches if we knew that the buckets were linearly distributed.
 size_t SampleVector::GetBucketIndex(Sample value) const {
   size_t bucket_count = bucket_ranges_->size() - 1;
-  CHECK_GE(bucket_count, 1u);
-  CHECK_GE(value, bucket_ranges_->range(0));
-  CHECK_LT(value, bucket_ranges_->range(bucket_count));
+  //CHECK_GE(bucket_count, 1u);
+  //CHECK_GE(value, bucket_ranges_->range(0));
+  //CHECK_LT(value, bucket_ranges_->range(bucket_count));
 
   size_t under = 0;
   size_t over = bucket_count;
   size_t mid;
   do {
-    DCHECK_GE(over, under);
+    //DCHECK_GE(over, under);
     mid = under + (over - under)/2;
     if (mid == under)
       break;
@@ -102,8 +102,8 @@ size_t SampleVector::GetBucketIndex(Sample value) const {
       over = mid;
   } while (true);
 
-  DCHECK_LE(bucket_ranges_->range(mid), value);
-  CHECK_GT(bucket_ranges_->range(mid + 1), value);
+  //DCHECK_LE(bucket_ranges_->range(mid), value);
+  //CHECK_GT(bucket_ranges_->range(mid + 1), value);
   return mid;
 }
 
@@ -112,7 +112,7 @@ SampleVectorIterator::SampleVectorIterator(const vector<Count>* counts,
     : counts_(counts),
       bucket_ranges_(bucket_ranges),
       index_(0) {
-  CHECK_GT(bucket_ranges_->size(), counts_->size());
+  //CHECK_GT(bucket_ranges_->size(), counts_->size());
   SkipEmptyBuckets();
 }
 
@@ -123,7 +123,7 @@ bool SampleVectorIterator::Done() const {
 }
 
 void SampleVectorIterator::Next() {
-  DCHECK(!Done());
+  //DCHECK(!Done());
   index_++;
   SkipEmptyBuckets();
 }
@@ -131,7 +131,7 @@ void SampleVectorIterator::Next() {
 void SampleVectorIterator::Get(HistogramBase::Sample* min,
                                HistogramBase::Sample* max,
                                HistogramBase::Count* count) const {
-  DCHECK(!Done());
+  //DCHECK(!Done());
   if (min != NULL)
     *min = bucket_ranges_->range(index_);
   if (max != NULL)
@@ -141,7 +141,7 @@ void SampleVectorIterator::Get(HistogramBase::Sample* min,
 }
 
 bool SampleVectorIterator::GetBucketIndex(size_t* index) const {
-  DCHECK(!Done());
+  //DCHECK(!Done());
   if (index != NULL)
     *index = index_;
   return true;

DesktopEditor/clipboard/src/base/process_util_linux.cc

@@ -60,7 +60,7 @@ bool ReadProcStats(pid_t pid, std::string* buffer) {
 
   FilePath stat_file = GetProcPidDir(pid).Append(kStatFile);
   if (!file_util::ReadFileToString(stat_file, buffer)) {
-    DLOG(WARNING) << "Failed to get process stats.";
+    //DLOG(WARNING) << "Failed to get process stats.";
     return false;
   }
   return !buffer->empty();
@@ -85,8 +85,8 @@ bool ParseProcStats(const std::string& stats_data,
   if (open_parens_idx == std::string::npos ||
       close_parens_idx == std::string::npos ||
       open_parens_idx > close_parens_idx) {
-    DLOG(WARNING) << "Failed to find matched parens in '" << stats_data << "'";
-    NOTREACHED();
+    //DLOG(WARNING) << "Failed to find matched parens in '" << stats_data << "'";
+    //NOTREACHED();
     return false;
   }
   open_parens_idx++;
@@ -112,8 +112,8 @@ bool ParseProcStats(const std::string& stats_data,
 // simply |pid|, and the next two values are strings.
 int GetProcStatsFieldAsInt(const std::vector<std::string>& proc_stats,
                            ProcStatsFields field_num) {
-  DCHECK_GE(field_num, VM_PPID);
-  CHECK_LT(static_cast<size_t>(field_num), proc_stats.size());
+  //DCHECK_GE(field_num, VM_PPID);
+  //CHECK_LT(static_cast<size_t>(field_num), proc_stats.size());
 
   int value;
   return StringToInt(proc_stats[field_num], &value) ? value : 0;
@@ -122,8 +122,8 @@ int GetProcStatsFieldAsInt(const std::vector<std::string>& proc_stats,
 // Same as GetProcStatsFieldAsInt(), but for size_t values.
 size_t GetProcStatsFieldAsSizeT(const std::vector<std::string>& proc_stats,
                                 ProcStatsFields field_num) {
-  DCHECK_GE(field_num, VM_PPID);
-  CHECK_LT(static_cast<size_t>(field_num), proc_stats.size());
+  //DCHECK_GE(field_num, VM_PPID);
+  //CHECK_LT(static_cast<size_t>(field_num), proc_stats.size());
 
   size_t value;
   return StringToSizeT(proc_stats[field_num], &value) ? value : 0;
@@ -160,14 +160,14 @@ std::string GetProcStatsFieldAsString(
     const std::vector<std::string>& proc_stats,
     ProcStatsFields field_num) {
   if (field_num < VM_COMM || field_num > VM_STATE) {
-    NOTREACHED();
+    //NOTREACHED();
     return std::string();
   }
 
   if (proc_stats.size() > static_cast<size_t>(field_num))
     return proc_stats[field_num];
 
-  NOTREACHED();
+  //NOTREACHED();
   return 0;
 }
 
@@ -208,7 +208,7 @@ pid_t ProcDirSlotToPid(const char* d_name) {
   pid_t pid;
   std::string pid_string(d_name);
   if (!StringToInt(pid_string, &pid)) {
-    NOTREACHED();
+    //NOTREACHED();
     return 0;
   }
   return pid;
@@ -222,7 +222,7 @@ int GetProcessCPU(pid_t pid) {
 
   DIR* dir = opendir(task_path.value().c_str());
   if (!dir) {
-    DPLOG(ERROR) << "opendir(" << task_path.value() << ")";
+    //DPLOG(ERROR) << "opendir(" << task_path.value() << ")";
     return -1;
   }
 
@@ -270,7 +270,7 @@ size_t ReadProcStatusAndGetFieldAsSizeT(pid_t pid, const std::string& field) {
         state = KEY_VALUE;
         break;
       case KEY_VALUE:
-        DCHECK(!last_key_name.empty());
+        //DCHECK(!last_key_name.empty());
         if (last_key_name == field) {
           std::string value_str;
           tokenizer.token_piece().CopyToString(&value_str);
@@ -279,12 +279,12 @@ size_t ReadProcStatusAndGetFieldAsSizeT(pid_t pid, const std::string& field) {
           std::vector<std::string> split_value_str;
           SplitString(value_str_trimmed, ' ', &split_value_str);
           if (split_value_str.size() != 2 || split_value_str[1] != "kB") {
-            NOTREACHED();
+            //NOTREACHED();
             return 0;
           }
           size_t value;
           if (!StringToSizeT(split_value_str[0], &value)) {
-            NOTREACHED();
+            //NOTREACHED();
             return 0;
           }
           return value;
@@ -293,7 +293,7 @@ size_t ReadProcStatusAndGetFieldAsSizeT(pid_t pid, const std::string& field) {
         break;
     }
   }
-  NOTREACHED();
+  //NOTREACHED();
   return 0;
 }
 
@@ -369,7 +369,7 @@ bool ProcessIterator::CheckForNextProcess() {
 
     std::string runstate = GetProcStatsFieldAsString(proc_stats, VM_STATE);
     if (runstate.size() != 1) {
-      NOTREACHED();
+      //NOTREACHED();
       continue;
     }
 
@@ -383,7 +383,7 @@ bool ProcessIterator::CheckForNextProcess() {
     // There could be a lot of zombies, can't really decrement i here.
   }
   if (skipped >= kSkipLimit) {
-    NOTREACHED();
+    //NOTREACHED();
     return false;
   }
 
@@ -507,7 +507,7 @@ double ProcessMetrics::GetCPUUsage() {
   }
 
   int64 time_delta = time - last_time_;
-  DCHECK_NE(time_delta, 0);
+  //DCHECK_NE(time_delta, 0);
   if (time_delta == 0)
     return 0;
 
@@ -549,7 +549,7 @@ bool ProcessMetrics::GetIOCounters(IoCounters* io_counters) const {
         state = KEY_VALUE;
         break;
       case KEY_VALUE:
-        DCHECK(!last_key_name.empty());
+        //DCHECK(!last_key_name.empty());
         if (last_key_name == "syscr") {
           StringToInt64(tokenizer.token_piece(),
               reinterpret_cast<int64*>(&(*io_counters).ReadOperationCount));
@@ -638,26 +638,26 @@ bool GetSystemMemoryInfo(SystemMemoryInfoKB* meminfo) {
   FilePath meminfo_file("/proc/meminfo");
   std::string meminfo_data;
   if (!file_util::ReadFileToString(meminfo_file, &meminfo_data)) {
-    DLOG(WARNING) << "Failed to open " << meminfo_file.value();
+    //DLOG(WARNING) << "Failed to open " << meminfo_file.value();
     return false;
   }
   std::vector<std::string> meminfo_fields;
   SplitStringAlongWhitespace(meminfo_data, &meminfo_fields);
 
   if (meminfo_fields.size() < kMemCachedIndex) {
-    DLOG(WARNING) << "Failed to parse " << meminfo_file.value()
-                  << ".  Only found " << meminfo_fields.size() << " fields.";
+    //DLOG(WARNING) << "Failed to parse " << meminfo_file.value()
+    //                  << ".  Only found " << meminfo_fields.size() << " fields.";
     return false;
   }
 
-  DCHECK_EQ(meminfo_fields[kMemTotalIndex-1], "MemTotal:");
-  DCHECK_EQ(meminfo_fields[kMemFreeIndex-1], "MemFree:");
-  DCHECK_EQ(meminfo_fields[kMemBuffersIndex-1], "Buffers:");
-  DCHECK_EQ(meminfo_fields[kMemCachedIndex-1], "Cached:");
-  DCHECK_EQ(meminfo_fields[kMemActiveAnonIndex-1], "Active(anon):");
-  DCHECK_EQ(meminfo_fields[kMemInactiveAnonIndex-1], "Inactive(anon):");
-  DCHECK_EQ(meminfo_fields[kMemActiveFileIndex-1], "Active(file):");
-  DCHECK_EQ(meminfo_fields[kMemInactiveFileIndex-1], "Inactive(file):");
+  //DCHECK_EQ(meminfo_fields[kMemTotalIndex-1], "MemTotal:");
+  //DCHECK_EQ(meminfo_fields[kMemFreeIndex-1], "MemFree:");
+  //DCHECK_EQ(meminfo_fields[kMemBuffersIndex-1], "Buffers:");
+  //DCHECK_EQ(meminfo_fields[kMemCachedIndex-1], "Cached:");
+  //DCHECK_EQ(meminfo_fields[kMemActiveAnonIndex-1], "Active(anon):");
+  //DCHECK_EQ(meminfo_fields[kMemInactiveAnonIndex-1], "Inactive(anon):");
+  //DCHECK_EQ(meminfo_fields[kMemActiveFileIndex-1], "Active(file):");
+  //DCHECK_EQ(meminfo_fields[kMemInactiveFileIndex-1], "Inactive(file):");
 
   StringToInt(meminfo_fields[kMemTotalIndex], &meminfo->total);
   StringToInt(meminfo_fields[kMemFreeIndex], &meminfo->free);
@@ -735,8 +735,10 @@ void OnNoMemorySize(size_t size) {
 #endif
 
   if (size != 0)
-    LOG(FATAL) << "Out of memory, size = " << size;
-  LOG(FATAL) << "Out of memory.";
+  {
+    //LOG(FATAL) << "Out of memory, size = " << size;
+  }
+  //LOG(FATAL) << "Out of memory.";
 }
 
 void OnNoMemory() {
@@ -857,8 +859,8 @@ bool AdjustOOMScore(ProcessId process, int score) {
   FilePath oom_file = oom_path.AppendASCII("oom_score_adj");
   if (file_util::PathExists(oom_file)) {
     std::string score_str = IntToString(score);
-    DVLOG(1) << "Adjusting oom_score_adj of " << process << " to "
-             << score_str;
+    //DVLOG(1) << "Adjusting oom_score_adj of " << process << " to "
+    //         << score_str;
     int score_len = static_cast<int>(score_str.length());
     return (score_len == file_util::WriteFile(oom_file,
                                               score_str.c_str(),
@@ -875,7 +877,7 @@ bool AdjustOOMScore(ProcessId process, int score) {
 
     int converted_score = score * kMaxOldOomScore / kMaxOomScore;
     std::string score_str = IntToString(converted_score);
-    DVLOG(1) << "Adjusting oom_adj of " << process << " to " << score_str;
+    //DVLOG(1) << "Adjusting oom_adj of " << process << " to " << score_str;
     int score_len = static_cast<int>(score_str.length());
     return (score_len == file_util::WriteFile(oom_file,
                                               score_str.c_str(),

DesktopEditor/clipboard/src/base/strings/string_split.cc

@@ -36,7 +36,7 @@ static void SplitStringT(const STR& str,
 void SplitString(const string16& str,
                  char16 c,
                  std::vector<string16>* r) {
-  DCHECK(CBU16_IS_SINGLE(c));
+  //DCHECK(CBU16_IS_SINGLE(c));
   SplitStringT(str, c, true, r);
 }
 
@@ -44,9 +44,9 @@ void SplitString(const std::string& str,
                  char c,
                  std::vector<std::string>* r) {
 #if CHAR_MIN < 0
-  DCHECK(c >= 0);
+  //DCHECK(c >= 0);
 #endif
-  DCHECK(c < 0x7F);
+  //DCHECK(c < 0x7F);
   SplitStringT(str, c, true, r);
 }
 
@@ -60,7 +60,7 @@ bool SplitStringIntoKeyValues(
   // Find the key string.
   size_t end_key_pos = line.find_first_of(key_value_delimiter);
   if (end_key_pos == std::string::npos) {
-    DVLOG(1) << "cannot parse key from line: " << line;
+    //DVLOG(1) << "cannot parse key from line: " << line;
     return false;    // no key
   }
   key->assign(line, 0, end_key_pos);
@@ -69,7 +69,7 @@ bool SplitStringIntoKeyValues(
   std::string remains(line, end_key_pos, line.size() - end_key_pos);
   size_t begin_values_pos = remains.find_first_not_of(key_value_delimiter);
   if (begin_values_pos == std::string::npos) {
-    DVLOG(1) << "cannot parse value from line: " << line;
+    //DVLOG(1) << "cannot parse value from line: " << line;
     return false;   // no value
   }
   std::string values_string(remains, begin_values_pos,
@@ -106,7 +106,7 @@ bool SplitStringIntoKeyValuePairs(
       // values; just record that our split failed.
       success = false;
     }
-    DCHECK_LE(value.size(), 1U);
+    //DCHECK_LE(value.size(), 1U);
     kv_pairs->push_back(
         make_pair(key, value.empty() ? std::string() : value[0]));
   }
@@ -151,18 +151,18 @@ void SplitStringUsingSubstr(const std::string& str,
 void SplitStringDontTrim(const string16& str,
                          char16 c,
                          std::vector<string16>* r) {
-  DCHECK(CBU16_IS_SINGLE(c));
+  //DCHECK(CBU16_IS_SINGLE(c));
   SplitStringT(str, c, false, r);
 }
 
 void SplitStringDontTrim(const std::string& str,
                          char c,
                          std::vector<std::string>* r) {
-  DCHECK(IsStringUTF8(str));
+  //DCHECK(IsStringUTF8(str));
 #if CHAR_MIN < 0
-  DCHECK(c >= 0);
+  //DCHECK(c >= 0);
 #endif
-  DCHECK(c < 0x7F);
+  //DCHECK(c < 0x7F);
   SplitStringT(str, c, false, r);
 }
 

DesktopEditor/clipboard/src/base/synchronization/cancellation_flag.cc

@@ -10,7 +10,7 @@ namespace base {
 
 void CancellationFlag::Set() {
 #if !defined(NDEBUG)
-  DCHECK_EQ(set_on_, PlatformThread::CurrentId());
+  //DCHECK_EQ(set_on_, PlatformThread::CurrentId());
 #endif
   base::subtle::Release_Store(&flag_, 1);
 }

DesktopEditor/clipboard/src/base/third_party/nspr/prtime.cc

@@ -67,6 +67,7 @@
 #include "base/third_party/nspr/prtime.h"
 #include "build/build_config.h"
 
+#include <ctype.h>
 #if defined(OS_WIN)
 #include <windows.h>
 #elif defined(OS_MACOSX)
@@ -540,7 +541,7 @@ PR_ParseTimeString(
 
   int iterations = 0;
 
-  PR_ASSERT(string && result);
+  //PR_ASSERT(string && result);
   if (!string || !result) return PR_FAILURE;
 
   while (*rest)
@@ -1073,7 +1074,7 @@ PR_ParseTimeString(
                 case TT_EET: zone_offset =  2 * 60; break;
                 case TT_JST: zone_offset =  9 * 60; break;
                 default:
-                  PR_ASSERT (0);
+                  //PR_ASSERT (0);
                   break;
                 }
         }
@@ -1121,11 +1122,11 @@ PR_ParseTimeString(
           struct tm localTime;
           time_t secs;
 
-          PR_ASSERT(result->tm_month > -1 &&
-                    result->tm_mday > 0 &&
-                    result->tm_hour > -1 &&
-                    result->tm_min > -1 &&
-                    result->tm_sec > -1);
+          //PR_ASSERT(result->tm_month > -1 &&
+          //          result->tm_mday > 0 &&
+          //          result->tm_hour > -1 &&
+          //          result->tm_min > -1 &&
+          //          result->tm_sec > -1);
 
             /*
              * To obtain time_t from a tm structure representing the local

DesktopEditor/clipboard/src/base/values.cc

@@ -19,7 +19,7 @@ namespace {
 // in the copy. It's possible for this function to return NULL and it
 // expects |node| to always be non-NULL.
 Value* CopyWithoutEmptyChildren(const Value* node) {
-  DCHECK(node);
+  //DCHECK(node);
   switch (node->GetType()) {
     case Value::TYPE_LIST: {
       const ListValue* list = static_cast<const ListValue*>(node);
@@ -152,14 +152,14 @@ bool Value::GetAsDictionary(const DictionaryValue** out_value) const {
 Value* Value::DeepCopy() const {
   // This method should only be getting called for null Values--all subclasses
   // need to provide their own implementation;.
-  DCHECK(IsType(TYPE_NULL));
+  //DCHECK(IsType(TYPE_NULL));
   return CreateNullValue();
 }
 
 bool Value::Equals(const Value* other) const {
   // This method should only be getting called for null Values--all subclasses
   // need to provide their own implementation;.
-  DCHECK(IsType(TYPE_NULL));
+  //DCHECK(IsType(TYPE_NULL));
   return other->IsType(TYPE_NULL);
 }
 
@@ -192,8 +192,8 @@ FundamentalValue::FundamentalValue(int in_value)
 FundamentalValue::FundamentalValue(double in_value)
     : Value(TYPE_DOUBLE), double_value_(in_value) {
   if (!IsFinite(double_value_)) {
-    NOTREACHED() << "Non-finite (i.e. NaN or positive/negative infinity) "
-                 << "values cannot be represented in JSON";
+    //NOTREACHED() << "Non-finite (i.e. NaN or positive/negative infinity) "
+    //             << "values cannot be represented in JSON";
     double_value_ = 0.0;
   }
 }
@@ -233,7 +233,7 @@ FundamentalValue* FundamentalValue::DeepCopy() const {
       return CreateDoubleValue(double_value_);
 
     default:
-      NOTREACHED();
+      //NOTREACHED();
       return NULL;
   }
 }
@@ -256,7 +256,7 @@ bool FundamentalValue::Equals(const Value* other) const {
       return GetAsDouble(&lhs) && other->GetAsDouble(&rhs) && lhs == rhs;
     }
     default:
-      NOTREACHED();
+      //NOTREACHED();
       return false;
   }
 }
@@ -266,7 +266,7 @@ bool FundamentalValue::Equals(const Value* other) const {
 StringValue::StringValue(const std::string& in_value)
     : Value(TYPE_STRING),
       value_(in_value) {
-  DCHECK(IsStringUTF8(in_value));
+  //DCHECK(IsStringUTF8(in_value));
 }
 
 StringValue::StringValue(const string16& in_value)
@@ -361,9 +361,9 @@ bool DictionaryValue::GetAsDictionary(const DictionaryValue** out_value) const {
 }
 
 bool DictionaryValue::HasKey(const std::string& key) const {
-  DCHECK(IsStringUTF8(key));
+  //DCHECK(IsStringUTF8(key));
   ValueMap::const_iterator current_entry = dictionary_.find(key);
-  DCHECK((current_entry == dictionary_.end()) || current_entry->second);
+  //DCHECK((current_entry == dictionary_.end()) || current_entry->second);
   return current_entry != dictionary_.end();
 }
 
@@ -378,8 +378,8 @@ void DictionaryValue::Clear() {
 }
 
 void DictionaryValue::Set(const std::string& path, Value* in_value) {
-  DCHECK(IsStringUTF8(path));
-  DCHECK(in_value);
+  //DCHECK(IsStringUTF8(path));
+  //DCHECK(in_value);
 
   std::string current_path(path);
   DictionaryValue* current_dictionary = this;
@@ -430,7 +430,7 @@ void DictionaryValue::SetWithoutPathExpansion(const std::string& key,
   std::pair<ValueMap::iterator, bool> ins_res =
       dictionary_.insert(std::make_pair(key, in_value));
   if (!ins_res.second) {
-    DCHECK_NE(ins_res.first->second, in_value);  // This would be bogus
+    //DCHECK_NE(ins_res.first->second, in_value);  // This would be bogus
     delete ins_res.first->second;
     ins_res.first->second = in_value;
   }
@@ -463,7 +463,7 @@ void DictionaryValue::SetStringWithoutPathExpansion(
 
 bool DictionaryValue::Get(
     const std::string& path, const Value** out_value) const {
-  DCHECK(IsStringUTF8(path));
+  //DCHECK(IsStringUTF8(path));
   std::string current_path(path);
   const DictionaryValue* current_dictionary = this;
   for (size_t delimiter_position = current_path.find('.');
@@ -539,7 +539,7 @@ bool DictionaryValue::GetStringASCII(const std::string& path,
     return false;
 
   if (!IsStringASCII(out)) {
-    NOTREACHED();
+    //NOTREACHED();
     return false;
   }
 
@@ -608,7 +608,7 @@ bool DictionaryValue::GetList(const std::string& path, ListValue** out_value) {
 
 bool DictionaryValue::GetWithoutPathExpansion(const std::string& key,
                                               const Value** out_value) const {
-  DCHECK(IsStringUTF8(key));
+  //DCHECK(IsStringUTF8(key));
   ValueMap::const_iterator entry_iterator = dictionary_.find(key);
   if (entry_iterator == dictionary_.end())
     return false;
@@ -719,7 +719,7 @@ bool DictionaryValue::GetListWithoutPathExpansion(const std::string& key,
 }
 
 bool DictionaryValue::Remove(const std::string& path, Value** out_value) {
-  DCHECK(IsStringUTF8(path));
+  //DCHECK(IsStringUTF8(path));
   std::string current_path(path);
   DictionaryValue* current_dictionary = this;
   size_t delimiter_position = current_path.rfind('.');
@@ -736,7 +736,7 @@ bool DictionaryValue::Remove(const std::string& path, Value** out_value) {
 
 bool DictionaryValue::RemoveWithoutPathExpansion(const std::string& key,
                                                  Value** out_value) {
-  DCHECK(IsStringUTF8(key));
+  //DCHECK(IsStringUTF8(key));
   ValueMap::iterator entry_iterator = dictionary_.find(key);
   if (entry_iterator == dictionary_.end())
     return false;
@@ -839,7 +839,7 @@ bool ListValue::Set(size_t index, Value* in_value) {
       Append(CreateNullValue());
     Append(in_value);
   } else {
-    DCHECK(list_[index] != in_value);
+    //DCHECK(list_[index] != in_value);
     delete list_[index];
     list_[index] = in_value;
   }
@@ -995,7 +995,7 @@ ListValue::iterator ListValue::Erase(iterator iter, Value** out_value) {
 }
 
 void ListValue::Append(Value* in_value) {
-  DCHECK(in_value);
+  //DCHECK(in_value);
   list_.push_back(in_value);
 }
 
@@ -1034,7 +1034,7 @@ void ListValue::AppendStrings(const std::vector<string16>& in_values) {
 }
 
 bool ListValue::AppendIfNotPresent(Value* in_value) {
-  DCHECK(in_value);
+  //DCHECK(in_value);
   for (ValueVector::const_iterator i(list_.begin()); i != list_.end(); ++i) {
     if ((*i)->Equals(in_value)) {
       delete in_value;
@@ -1046,7 +1046,7 @@ bool ListValue::AppendIfNotPresent(Value* in_value) {
 }
 
 bool ListValue::Insert(size_t index, Value* in_value) {
-  DCHECK(in_value);
+  //DCHECK(in_value);
   if (index > list_.size())
     return false;
 

DesktopEditor/clipboard/src/ui/base/clipboard/clipboard_gtk.cc

@@ -15,7 +15,7 @@
 #include "base/basictypes.h"
 #include "base/files/file_path.h"
 #include "base/logging.h"
-#include "base/memory/singleton.h"
+//#include "base/memory/singleton.h"
 #include "base/utf_string_conversions.h"
 //#include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/clipboard/custom_data_helper.h"
@@ -30,6 +30,7 @@ namespace ui {
 
 namespace {
 
+/*
 class SelectionChangeObserver {
  public:
   static SelectionChangeObserver* GetInstance();
@@ -105,7 +106,7 @@ GdkFilterReturn SelectionChangeObserver::OnXEvent(GdkXEvent* xevent,
   }
   return GDK_FILTER_CONTINUE;
 }
-
+*/
 const char kSourceTagType[] = "org.chromium.source-tag";
 const char kMimeTypeBitmap[] = "image/bmp";
 const char kMimeTypeMozillaURL[] = "text/x-moz-url";
@@ -621,11 +622,14 @@ SourceTag Clipboard::ReadSourceTag(Buffer buffer) const {
 }
 
 uint64 Clipboard::GetSequenceNumber(Buffer buffer) {
+    return 0;
   //DCHECK(CalledOnValidThread());
+    /*
   if (buffer == BUFFER_STANDARD)
     return SelectionChangeObserver::GetInstance()->clipboard_sequence_number();
   else
     return SelectionChangeObserver::GetInstance()->primary_sequence_number();
+    */
 }
 
 //static