Cleanup: Remove more dead GTK code.

remoting/host/remoting_me2me_host.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.
 //
 // This file implements a standalone host process for Me2Me.
 
 #include <string>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/debug/alias.h"
-#include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "build/build_config.h"
@@ skipping 67 matching lines @@
 #endif  // defined(OS_LINUX)
 
 #if defined(OS_WIN)
 #include <commctrl.h>
 #include "base/win/registry.h"
 #include "base/win/scoped_handle.h"
 #include "remoting/host/pairing_registry_delegate_win.h"
 #include "remoting/host/win/session_desktop_environment.h"
 #endif  // defined(OS_WIN)
 
-#if defined(TOOLKIT_GTK)
-#include "ui/gfx/gtk_util.h"
-#endif  // defined(TOOLKIT_GTK)
-
 using remoting::protocol::PairingRegistry;
 
 namespace {
 
 // This is used for tagging system event logs.
 const char kApplicationName[] = "chromoting";
 
 #if defined(OS_LINUX)
 // The command line switch used to pass name of the pipe to capture audio on
 // linux.
@@ skipping 1196 matching lines @@
   base::snprintf(message, sizeof(message),
                  "Requested by %s at %s, line %d.",
                  function_name.c_str(), file_name.c_str(), line_number);
   base::debug::Alias(message);
 
   // The daemon requested us to crash the process.
   CHECK(false) << message;
 }
 
 int HostProcessMain() {
-#if defined(TOOLKIT_GTK)

[Sergey Ulanov, 2014/06/10 05:29:39]

This needs to changed to OS_LINUX, but we don't won't to remove this code
completely.

[Lei Zhang, 2014/06/10 05:38:39]

but ui/gfx/gtk_util.h doesn't exist anymore and gfx::GtkInitFromCommandLine) is
now in chrome/browser/ui/libgtk2ui/gtk2_util.h. Do you want me to copy it out
here instead?

[Sergey Ulanov, 2014/06/10 06:05:55]

We can't depend on src/chrome here. Please replace gfx::GtkInitFromCommandLine()
with  gtk_init(NULL, NULL), same as in
remoting/host/it2me/it2me_native_messaging_host_main.cc .
Thank you! 

[Lei Zhang, 2014/06/10 07:02:28]

Done.

-  // Required for any calls into GTK functions, such as the Disconnect and
-  // Continue windows, though these should not be used for the Me2Me case
-  // (crbug.com/104377).
-  gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
-#endif  // TOOLKIT_GTK
-
   // Enable support for SSL server sockets, which must be done while still
   // single-threaded.
   net::EnableSSLServerSockets();
 
   // Ensures runtime specific CPU features are initialized.
   media::InitializeCPUSpecificMediaFeatures();
 
   // Create the main message loop and start helper threads.
   base::MessageLoopForUI message_loop;
   scoped_ptr<ChromotingHostContext> context =
@@ skipping 14 matching lines @@
   return exit_code;
 }
 
 }  // namespace remoting
 
 #if !defined(OS_WIN)
 int main(int argc, char** argv) {
   return remoting::HostMain(argc, argv);
 }
 #endif  // !defined(OS_WIN)