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

chrome_frame/test/test_with_web_server.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_TEST_WITH_WEB_SERVER_H_
 #define CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_
 #pragma once
 
 #include <windows.h>
 #include <string>
 
 #include "base/string_util.h"
 #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:
   enum Type {
     NONE = 0,
     META_TAG,
     HTTP_HEADER
   };
 
   CFInvocation(): method_(NONE) {}
@@ skipping 289 matching lines @@
 // Same as above except that the response does not include the no-cache header.
 ACTION_P2(SendAllowCacheResponse, server, invocation) {
   server->SendResponseHelper(arg0, arg1, invocation, false);
 }
 
 ACTION_P2(HandlePostedResponseHelper, server, invocation) {
   server->HandlePostedResponse(arg0, arg2);
 }
 
 #endif  // CHROME_FRAME_TEST_TEST_WITH_WEB_SERVER_H_