diff options
| author | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:47:23 +0000 |
|---|---|---|
| committer | robertshield@chromium.org <robertshield@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-17 16:47:23 +0000 |
| commit | f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4 (patch) | |
| tree | 150c11094e8caceea5f315df11bcf6073e1e1f45 /chrome_frame/test | |
| parent | 26be3c7afc6c1ab32edd302ff13c61530ee88c34 (diff) | |
| download | chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.zip chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.tar.gz chromium_src-f7dd598d1693bb5feb5f74b5f383c9f6b0c045c4.tar.bz2 | |
Revert 105803 - 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.
BUG=97185
TEST=Chrome Frame artifacts do not appear in e.g. build/Debug/obj/global_intermediate/
Review URL: http://codereview.chromium.org/8150002
TBR=robertshield@chromium.org
Review URL: http://codereview.chromium.org/8318013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@105823 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame/test')
| -rw-r--r-- | chrome_frame/test/chrome_frame_test_utils.h | 5 | ||||
| -rw-r--r-- | chrome_frame/test/chrome_tab_mocks.h | 6 | ||||
| -rw-r--r-- | chrome_frame/test/ie_event_sink.h | 5 | ||||
| -rw-r--r-- | chrome_frame/test/test_with_web_server.h | 4 |
4 files changed, 15 insertions, 5 deletions
diff --git a/chrome_frame/test/chrome_frame_test_utils.h b/chrome_frame/test/chrome_frame_test_utils.h index ed4a379..329adba 100644 --- a/chrome_frame/test/chrome_frame_test_utils.h +++ b/chrome_frame/test/chrome_frame_test_utils.h @@ -20,11 +20,14 @@ #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 feb488f..49e9809 100644 --- a/chrome_frame/test/chrome_tab_mocks.h +++ b/chrome_frame/test/chrome_tab_mocks.h @@ -1,4 +1,4 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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,9 +7,11 @@ #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/ie_event_sink.h b/chrome_frame/test/ie_event_sink.h index 2a0496d..1346e1c 100644 --- a/chrome_frame/test/ie_event_sink.h +++ b/chrome_frame/test/ie_event_sink.h @@ -11,10 +11,13 @@ #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/test_with_web_server.h b/chrome_frame/test/test_with_web_server.h index 6110327..ce86117 100644 --- a/chrome_frame/test/test_with_web_server.h +++ b/chrome_frame/test/test_with_web_server.h @@ -13,12 +13,14 @@ #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: |