Straighten up includes of host_desktop.h/host_desktop_type.h

chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.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.
 
 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
 
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_shutdown.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_list.h"
-#include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "chrome/test/base/test_browser_window.h"
 #include "chrome/test/base/testing_browser_process.h"
+#include "ui/gfx/host_desktop_type.h"
 
 typedef BrowserWithTestWindowTest BrowserListTest;
 
 namespace {
 
 // Helper function to iterate and count all the tabs.
 size_t CountAllTabs() {
   size_t count = 0;
   for (TabContentsIterator iterator; !iterator.done(); iterator.Next())
     ++count;
@@ skipping 162 matching lines @@
   testing_browser_process->SetProfileManager(profile_manager);
 
   chrome::AttemptRestart();
   // Cancel the effects of us calling chrome::AttemptRestart. Otherwise tests
   // ran after this one will fail.
   browser_shutdown::SetTryingToQuit(false);
 
   EXPECT_TRUE(testing_pref_service.GetBoolean(prefs::kWasRestarted));
   testing_browser_process->SetLocalState(NULL);
 }