Fix compiling of sync on linux.

chrome/browser/sync/util/character_set_converters.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_SYNC_UTIL_CHARACTER_SET_CONVERTERS_H_
 #define CHROME_BROWSER_SYNC_UTIL_CHARACTER_SET_CONVERTERS_H_
 
 // A pair of classes to convert UTF8 <-> UCS2 character strings.
 //
 // Note that the current implementation is limited to UCS2, whereas the
 // interface is agnostic to the wide encoding used.
 //
 // Also note that UCS2 is different from UTF-16, in that UTF-16 can encode all
 // the code points in the Unicode character set by multi-character encodings,
 // while UCS2 is limited to encoding < 2^16 code points.
 //
 // It appears that Windows support UTF-16, which means we have to be careful
 // what we feed this class.
 //
 // Usage:
 //   string utf8;
 //   CHECK(browser_sync::Append(wide_string, &utf8));
 //   PathString bob;
 //   CHECK(browser_sync::Append(utf8, &bob));
 //   PathString fred = bob;
 
-#ifdef OS_LINUX
-#include <glib.h>
-#endif
-
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/string16.h"
 #include "chrome/browser/sync/util/sync_types.h"
 
 // Need to cast literals (Linux, OSX)
 #define STRING16_UGLY_DOUBLE_DEFINE_HACK(s) \
   reinterpret_cast<const char16*>(L##s)
@@ skipping 186 matching lines @@
 inline PathString::size_type ToPathString::length() const {
   DCHECK(good_ && good_checked_);
   return result_.length();
 }
 
 void TrimPathStringToValidCharacter(PathString* string);
 
 }  // namespace browser_sync
 
 #endif  // CHROME_BROWSER_SYNC_UTIL_CHARACTER_SET_CONVERTERS_H_