Revert 105803 - Have Chrome Frame build its .idl artifacts into a sub-folder of SHARED_INTERMEDIA...

chrome_frame/test/chrome_frame_test_utils.h

 // 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.
 
 #ifndef CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
 #define CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_
 
 #include <windows.h>
 
 #include <atlbase.h>
 #include <atlwin.h>
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/process_util.h"
 #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.
 #define GMOCK_MUTANT_INCLUDE_LATE_OBJECT_BINDING
 #include "testing/gmock_mutant.h"
 
 interface IWebBrowser2;
 
 namespace chrome_frame_test {
 
@@ skipping 280 matching lines @@
 }  // namespace chrome_frame_test
 
 // TODO(tommi): This is a temporary workaround while we're getting our
 // Singleton story straight.  Ideally each test should clear up any singletons
 // it might have created, but test cases do not implicitly have their own
 // AtExitManager, so we have this workaround method for tests that depend on
 // "fresh" singletons.  The implementation is in chrome_frame_unittest_main.cc.
 void DeleteAllSingletons();
 
 #endif  // CHROME_FRAME_TEST_CHROME_FRAME_TEST_UTILS_H_