Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIATE_DIR, a globally common output folder. It's rude to dump things in the root of the dir that aren't used project-wide.

Also explicitly list the installer -> ChromeFrame dependency in src\chrome\installer\DEPS. It was already present but now check_deps catches it due to the correctly formatted include path.Remove several redundant instances of SHARED_INTERMEDIATE_DIR being added to the include lists.

BUG=97185
TEST=Chrome Frame artifacts do not appear in e.g. build/Debug/obj/global_intermediate/
Review URL: http://codereview.chromium.org/8317018

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@106287 0039d316-1c4b-4281-b951-d872f2087c98

23 files changed, 46 insertions, 104 deletions

diff --git a/chrome_frame/bho.h b/chrome_frame/bho.h
index 111eb04..6afeb61 100644
--- a/chrome_frame/bho.h
+++ b/chrome_frame/bho.h
@@ -15,7 +15,7 @@
 
 #include <string>
 
-#include "chrome_tab.h"  // NOLINT
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/delete_chrome_history.h"
 #include "chrome_frame/resource.h"
 #include "chrome_frame/urlmon_moniker.h"
diff --git a/chrome_frame/bho_loader.cc b/chrome_frame/bho_loader.cc
index 255bb6c..d76898c 100644
--- a/chrome_frame/bho_loader.cc
+++ b/chrome_frame/bho_loader.cc
@@ -9,8 +9,8 @@
 #include <exdisp.h>
 
 #include "chrome_frame/chrome_frame_helper_util.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/event_hooker.h"
-#include "chrome_tab.h"  // NOLINT
 
 
 // Describes the window class we look for.
diff --git a/chrome_frame/chrome_frame.gyp b/chrome_frame/chrome_frame.gyp
index a2f4891a..826510c 100644
--- a/chrome_frame/chrome_frame.gyp
+++ b/chrome_frame/chrome_frame.gyp
@@ -62,7 +62,7 @@
       'type': 'none',
       'msvs_settings': {
         'VCMIDLTool': {
-          'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)',
+          'OutputDirectory': '<(SHARED_INTERMEDIATE_DIR)/chrome_frame',
         },
       },
       'sources': [
@@ -89,7 +89,7 @@
         'locales/locales.gyp:*',
       ],
       'sources': [
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'chrome_frame_unittest_main.cc',
         'chrome_launcher.cc',
         'chrome_launcher.h',
@@ -125,7 +125,6 @@
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'conditions': [
         # We can't instrument code for coverage if it depends on 3rd party
@@ -249,7 +248,7 @@
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
         'chrome_launcher_version.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'test_utils.cc',
         'test_utils.h',
       ],
@@ -324,7 +323,7 @@
         '../chrome/test/base/chrome_process_util.cc',
         '../chrome/test/base/chrome_process_util.h',
         '../chrome/test/ui/ui_test.cc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'test/chrome_frame_test_utils.cc',
         'test/chrome_frame_test_utils.h',
         'test/perf/chrome_frame_perftest.cc',
@@ -414,7 +413,7 @@
         'test/net/test_automation_provider.h',
         'test/net/test_automation_resource_message_filter.cc',
         'test/net/test_automation_resource_message_filter.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources.rc',
         'test_utils.cc',
         'test_utils.h',
@@ -485,7 +484,7 @@
         'test/simulate_input.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         '../base/test/test_file_util_win.cc',
         '../chrome/test/automation/proxy_launcher.cc',
         '../chrome/test/automation/proxy_launcher.h',
@@ -537,6 +536,7 @@
         '../third_party/iaccessible2/iaccessible2.gyp:iaccessible2',
         'chrome_frame_ie',
         'chrome_frame_strings',
+        'chrome_tab_idl',
         'locales/locales.gyp:*',
         'npchrome_frame',
       ],
@@ -561,7 +561,7 @@
         'test/test_with_web_server.h',
         'test/win_event_receiver.cc',
         'test/win_event_receiver.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'chrome_tab.idl',
         'renderer_glue.cc',
         'test_utils.cc',
@@ -570,8 +570,6 @@
       'include_dirs': [
         '<(DEPTH)/third_party/wtl/include',
         '<(DEPTH)/breakpad/src',
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
       ],
       'resource_include_dirs': [
         '<(INTERMEDIATE_DIR)',
@@ -627,6 +625,7 @@
       ],
       'include_dirs': [
         # To allow including "version.h"
+        # TODO(grt): remove this as per http://crbug.com/99368
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
       'sources': [
@@ -675,7 +674,7 @@
         'chrome_protocol.cc',
         'chrome_protocol.h',
         'chrome_protocol.rgs',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'com_message_event.cc',
         'com_message_event.h',
         'com_type_info_holder.cc',
@@ -745,7 +744,6 @@
         '../third_party/active_doc/ole_document_impl.h',
       ],
       'include_dirs': [
-        '<(INTERMEDIATE_DIR)/../chrome_frame',
         '<(DEPTH)/third_party/wtl/include',
       ],
       'conditions': [
@@ -859,7 +857,7 @@
         'chrome_frame_reporting.h',
         'chrome_tab.cc',
         'chrome_tab.def',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         # FIXME(slightlyoff): For chrome_tab.tlb. Giant hack until we can
         #   figure out something more gyp-ish.
         'resources/tlb_resource.rc',
@@ -868,11 +866,6 @@
         'renderer_glue.cc',
         'resource.h',
       ],
-      'include_dirs': [
-        # For chrome_tab.h
-        '<(SHARED_INTERMEDIATE_DIR)',
-        '<(INTERMEDIATE_DIR)/../npchrome_frame',
-      ],
       'conditions': [
         ['OS=="win"', {
           # NOTE(slightlyoff):
diff --git a/chrome_frame/chrome_frame_activex.h b/chrome_frame/chrome_frame_activex.h
index b2d677b..9fea94b 100644
--- a/chrome_frame/chrome_frame_activex.h
+++ b/chrome_frame/chrome_frame_activex.h
@@ -14,12 +14,10 @@
 #include <vector>
 
 #include "chrome_frame/chrome_frame_activex_base.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/com_type_info_holder.h"
 #include "grit/chrome_frame_resources.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 #define WM_HOST_MOVED_NOTIFICATION (WM_APP + 1)
 
 // ChromeFrameActivex: Implementation of the ActiveX control that is
diff --git a/chrome_frame/chrome_frame_activex_base.h b/chrome_frame/chrome_frame_activex_base.h
index 500f9fa..7e83727 100644
--- a/chrome_frame/chrome_frame_activex_base.h
+++ b/chrome_frame/chrome_frame_activex_base.h
@@ -28,6 +28,7 @@
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/common/url_constants.h"
 #include "chrome_frame/chrome_frame_plugin.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/com_message_event.h"
 #include "chrome_frame/com_type_info_holder.h"
 #include "chrome_frame/simple_resource_loader.h"
@@ -37,9 +38,6 @@
 #include "grit/generated_resources.h"
 #include "net/base/cookie_monster.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 // Connection point class to support firing IChromeFrameEvents (dispinterface).
 template<class T>
 class ATL_NO_VTABLE ProxyDIChromeFrameEvents
diff --git a/chrome_frame/chrome_frame_helper_util.cc b/chrome_frame/chrome_frame_helper_util.cc
index 333fc96..0244557 100644
--- a/chrome_frame/chrome_frame_helper_util.cc
+++ b/chrome_frame/chrome_frame_helper_util.cc
@@ -3,7 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome_frame/chrome_frame_helper_util.h"
-#include "chrome_tab.h"  // NOLINT
+#include "chrome_frame/chrome_tab.h"
 
 #include <shlwapi.h>
 #include <stdio.h>
diff --git a/chrome_frame/chrome_frame_launcher.gyp b/chrome_frame/chrome_frame_launcher.gyp
index 87be09c..98974ea 100644
--- a/chrome_frame/chrome_frame_launcher.gyp
+++ b/chrome_frame/chrome_frame_launcher.gyp
@@ -68,10 +68,6 @@
         '../google_update/google_update.gyp:google_update',
         'chrome_frame.gyp:chrome_frame_utils',
       ],
-      'resource_include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)',
-      ],
       'sources': [
         'chrome_launcher_main.cc',
         'chrome_launcher_version.rc',
@@ -100,15 +96,6 @@
         'chrome_frame_helper_dll',
         'chrome_frame_helper_lib',
       ],
-      'resource_include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)',
-      ],
-      'include_dirs': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
-        '<(INTERMEDIATE_DIR)/../chrome_frame',
-      ],
       'sources': [
         'chrome_frame_helper_main.cc',
         'chrome_frame_helper_version.rc',
@@ -127,25 +114,16 @@
       'type': 'shared_library',
       'dependencies': [
         '../chrome/chrome.gyp:chrome_version_header',
+        'chrome_frame.gyp:chrome_tab_idl',
         'chrome_frame_helper_lib',
       ],
-      'resource_include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)',
-      ],
-      'include_dirs': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
-        '<(INTERMEDIATE_DIR)/../chrome_frame',
-      ],
       'sources': [
         'bho_loader.cc',
         'bho_loader.h',
         'chrome_frame_helper_dll.cc',
         'chrome_frame_helper_dll.def',
         'chrome_frame_helper_version.rc',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
-        'chrome_tab.idl',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'event_hooker.cc',
         'event_hooker.h',
         'iids.cc',
@@ -164,23 +142,14 @@
       'type': 'static_library',
       'dependencies': [
         '../chrome/chrome.gyp:chrome_version_header',
-      ],
-      'resource_include_dirs': [
-        '<(INTERMEDIATE_DIR)',
-        '<(SHARED_INTERMEDIATE_DIR)',
-      ],
-      'include_dirs': [
-        # To allow including "chrome_tab.h"
-        '<(INTERMEDIATE_DIR)',
-        '<(INTERMEDIATE_DIR)/../chrome_frame',
+        'chrome_frame.gyp:chrome_tab_idl',
       ],
       'sources': [
         'chrome_frame_helper_util.cc',
         'chrome_frame_helper_util.h',
         'registry_watcher.cc',
         'registry_watcher.h',
-        '<(SHARED_INTERMEDIATE_DIR)/chrome_tab.h',
-        'chrome_tab.idl',
+        '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
         'iids.cc',
       ],
       'msvs_settings': {
diff --git a/chrome_frame/chrome_protocol.h b/chrome_frame/chrome_protocol.h
index d98ca69..f89ac70 100644
--- a/chrome_frame/chrome_protocol.h
+++ b/chrome_frame/chrome_protocol.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -7,12 +7,11 @@
 
 #include <atlbase.h>
 #include <atlcom.h>
+
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/resource.h"
 #include "grit/chrome_frame_resources.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 // ChromeProtocol
 class ATL_NO_VTABLE ChromeProtocol
     : public CComObjectRootEx<CComSingleThreadModel>,
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc
index 86de19e..1a8df60 100644
--- a/chrome_frame/chrome_tab.cc
+++ b/chrome_frame/chrome_tab.cc
@@ -4,8 +4,8 @@
 
 // chrome_tab.cc : Implementation of DLL Exports.
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
+// Need to include this before the ATL headers below.
+#include "chrome_frame/chrome_tab.h"
 
 #include <atlsecurity.h>
 #include <objbase.h>
diff --git a/chrome_frame/delete_chrome_history.h b/chrome_frame/delete_chrome_history.h
index 947f673..810f35f 100644
--- a/chrome_frame/delete_chrome_history.h
+++ b/chrome_frame/delete_chrome_history.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -14,11 +14,9 @@
 #include "base/message_loop.h"
 #include "chrome_frame/bho.h"
 #include "chrome_frame/chrome_frame_plugin.h"
+#include "chrome_frame/chrome_tab.h"
 #include "grit/chrome_frame_resources.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 class Bho;
 
 // DeleteChromeHistory: Implements IDeleteBrowsingHistory and
diff --git a/chrome_frame/html_private_window_impl.h b/chrome_frame/html_private_window_impl.h
index 358df46..18414b8 100644
--- a/chrome_frame/html_private_window_impl.h
+++ b/chrome_frame/html_private_window_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,7 +9,7 @@
 #include <atlcom.h>
 #include <mshtml.h>
 
-#include "chrome_tab.h"  // NOLINT
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/resource.h"
 #include "grit/chrome_frame_resources.h"
 
diff --git a/chrome_frame/html_window_impl.h b/chrome_frame/html_window_impl.h
index 2e76b93..2bce98c 100644
--- a/chrome_frame/html_window_impl.h
+++ b/chrome_frame/html_window_impl.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -9,7 +9,7 @@
 #include <atlcom.h>
 #include <mshtml.h>
 
-#include "chrome_tab.h"  // NOLINT
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/resource.h"
 #include "grit/chrome_frame_resources.h"
 
diff --git a/chrome_frame/iids.cc b/chrome_frame/iids.cc
index 681250a..fe91568 100644
--- a/chrome_frame/iids.cc
+++ b/chrome_frame/iids.cc
@@ -1,10 +1,10 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
 // Pull in IIDs, CLSIDs etc from our .idl file.
-#include "chrome_tab.h"
+#include "chrome_frame/chrome_tab.h"
 
 extern "C" {
-#include "chrome_tab_i.c"
+#include "chrome_frame/chrome_tab_i.c"
 }
diff --git a/chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.cc b/chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.cc
index 45ff01b..7e066d1 100644
--- a/chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.cc
+++ b/chrome_frame/ready_mode/internal/ready_mode_web_browser_adapter.cc
@@ -6,7 +6,7 @@
 
 #include "base/logging.h"
 #include "base/win/win_util.h"
-#include "chrome_tab.h"  // NOLINT
+#include "chrome_frame/chrome_tab.h"
 
 _ATL_FUNC_INFO ReadyModeWebBrowserAdapter::kBeforeNavigate2Info = {
   CC_STDCALL, VT_EMPTY, 7, {
diff --git a/chrome_frame/resources/tlb_resource.rc b/chrome_frame/resources/tlb_resource.rc
index 1267413..2b44b9a 100644
--- a/chrome_frame/resources/tlb_resource.rc
+++ b/chrome_frame/resources/tlb_resource.rc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
@@ -35,4 +35,4 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
 //
 // Generated from the TEXTINCLUDE 3 resource.
 //
-1 TYPELIB "chrome_tab.tlb"
+1 TYPELIB "chrome_frame/chrome_tab.tlb"
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h
index 329adba..ed4a379 100644
--- a/chrome_frame/test/chrome_frame_test_utils.h
+++ b/chrome_frame/test/chrome_frame_test_utils.h
@@ -20,14 +20,11 @@
 #include "base/test/test_reg_util_win.h"
 #include "base/win/registry.h"
 #include "base/win/scoped_comptr.h"
-
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 #include "gtest/gtest.h"
 
 // Needed for CreateFunctor.
diff --git a/chrome_frame/test/chrome_tab_mocks.h b/chrome_frame/test/chrome_tab_mocks.h
index 49e9809..feb488f 100644
--- a/chrome_frame/test/chrome_tab_mocks.h
+++ b/chrome_frame/test/chrome_tab_mocks.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 //
@@ -7,11 +7,9 @@
 #ifndef CHROME_FRAME_TEST_CHROME_TAB_MOCKS_H_
 #define CHROME_FRAME_TEST_CHROME_TAB_MOCKS_H_
 
+#include "chrome_frame/chrome_tab.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 namespace testing {
 
 class IChromeFramePrivilegedMockImpl : public IChromeFramePrivileged {
diff --git a/chrome_frame/test/dll_redirector_loading_test.cc b/chrome_frame/test/dll_redirector_loading_test.cc
index 0dbf104..9b7840a 100644
--- a/chrome_frame/test/dll_redirector_loading_test.cc
+++ b/chrome_frame/test/dll_redirector_loading_test.cc
@@ -18,12 +18,11 @@
 #include "base/win/scoped_comptr.h"
 #include "chrome/installer/test/alternate_version_generator.h"
 #include "chrome/installer/util/delete_after_reboot_helper.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-#include "chrome_tab.h"  // NOLINT
-
 namespace {
 const wchar_t kSharedMemoryPrefix[] = L"ChromeFrameVersionBeacon_";
 const uint32 kSharedMemoryBytes = 128;
diff --git a/chrome_frame/test/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h
index 1346e1c..2a0496d 100644
--- a/chrome_frame/test/ie_event_sink.h
+++ b/chrome_frame/test/ie_event_sink.h
@@ -11,13 +11,10 @@
 #include <string>
 
 #include "base/win/scoped_comptr.h"
-
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test/simulate_input.h"
 #include "chrome_frame/test_utils.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 namespace chrome_frame_test {
 
 // Listener for all events from the IEEventSink, defined below. This includes
diff --git a/chrome_frame/test/perf/chrome_frame_perftest.cc b/chrome_frame/test/perf/chrome_frame_perftest.cc
index 0dd4579..722bb19 100644
--- a/chrome_frame/test/perf/chrome_frame_perftest.cc
+++ b/chrome_frame/test/perf/chrome_frame_perftest.cc
@@ -9,8 +9,6 @@
 #include <vector>
 #include <string>
 
-#include "chrome_tab.h"  // Generated from chrome_tab.idl.
-
 #include "base/debug/trace_event_win.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ -33,6 +31,7 @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/test/base/chrome_process_util.h"
 #include "chrome/test/ui/ui_perf_test.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test_utils.h"
 #include "chrome_frame/utils.h"
 
diff --git a/chrome_frame/test/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h
index ce86117..6110327 100644
--- a/chrome_frame/test/test_with_web_server.h
+++ b/chrome_frame/test/test_with_web_server.h
@@ -13,14 +13,12 @@
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "base/win/scoped_handle.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/test/chrome_frame_test_utils.h"
 #include "chrome_frame/test/test_server.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
-// Include without path to make GYP build see it.
-#include "chrome_tab.h"  // NOLINT
-
 // Specifies the invocation method for CF.
 class CFInvocation {
  public:
diff --git a/chrome_frame/urlmon_bind_status_callback.cc b/chrome_frame/urlmon_bind_status_callback.cc
index d4633d1..1c70b86 100644
--- a/chrome_frame/urlmon_bind_status_callback.cc
+++ b/chrome_frame/urlmon_bind_status_callback.cc
@@ -13,9 +13,9 @@
 #include "base/threading/platform_thread.h"
 #include "base/utf_string_conversions.h"
 #include "chrome_frame/bind_context_info.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/exception_barrier.h"
 #include "chrome_frame/urlmon_moniker.h"
-#include "chrome_tab.h"  // NOLINT
 
 
 // A helper to given feed data to the specified |bscb| using
diff --git a/chrome_frame/utils.cc b/chrome_frame/utils.cc
index 82436f3..7cb2b14 100644
--- a/chrome_frame/utils.cc
+++ b/chrome_frame/utils.cc
@@ -29,6 +29,7 @@
 #include "chrome/common/chrome_paths_internal.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/chrome_frame_distribution.h"
+#include "chrome_frame/chrome_tab.h"
 #include "chrome_frame/extra_system_apis.h"
 #include "chrome_frame/html_utils.h"
 #include "chrome_frame/navigation_constraints.h"
@@ -41,8 +42,6 @@
 #include "net/http/http_util.h"
 #include "ui/base/models/menu_model.h"
 
-#include "chrome_tab.h"  // NOLINT
-
 using base::win::RegKey;
 
 // Note that these values are all lower case and are compared to