diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 18:48:47 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-29 18:48:47 +0000 |
| commit | c303617213c42c1a3f26c7f777beb6f14daa1d3c (patch) | |
| tree | 6737fb1ce8cb564b6eff5eb0ba74c13ccdcdfe18 /chrome_frame | |
| parent | 49760768467e0f7ed83cf4ce86d6b6a0afb9af90 (diff) | |
| download | chromium_src-c303617213c42c1a3f26c7f777beb6f14daa1d3c.zip chromium_src-c303617213c42c1a3f26c7f777beb6f14daa1d3c.tar.gz chromium_src-c303617213c42c1a3f26c7f777beb6f14daa1d3c.tar.bz2 | |
Fix more fallouts of variations target move.
Broken by: https://codereview.chromium.org/23097007
I wish these were caught by the try bots.
BUG=266007
TBR=lambroslambrou@chromium.org
Review URL: https://codereview.chromium.org/23493012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@220345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
| -rw-r--r-- | chrome_frame/chrome_tab.cc | 2 | ||||
| -rw-r--r-- | chrome_frame/test/run_all_unittests.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/chrome_frame/chrome_tab.cc b/chrome_frame/chrome_tab.cc index 6ddfd49..70c188b 100644 --- a/chrome_frame/chrome_tab.cc +++ b/chrome_frame/chrome_tab.cc @@ -29,7 +29,6 @@ #include "base/win/windows_version.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/metrics/entropy_provider.h" #include "chrome/installer/util/google_update_settings.h" #include "chrome_frame/bho.h" #include "chrome_frame/chrome_active_document.h" @@ -43,6 +42,7 @@ #include "chrome_frame/pin_module.h" #include "chrome_frame/resource.h" #include "chrome_frame/utils.h" +#include "components/variations/entropy_provider.h" #include "grit/chrome_frame_resources.h" #include "url/url_util.h" diff --git a/chrome_frame/test/run_all_unittests.cc b/chrome_frame/test/run_all_unittests.cc index 97fb40b..8d42783 100644 --- a/chrome_frame/test/run_all_unittests.cc +++ b/chrome_frame/test/run_all_unittests.cc @@ -11,7 +11,6 @@ #include "base/threading/platform_thread.h" #include "base/win/scoped_com_initializer.h" #include "chrome/common/chrome_paths.h" -#include "chrome/common/metrics/entropy_provider.h" #include "chrome/test/logging/win/test_log_collector.h" #include "chrome_frame/crash_server_init.h" #include "chrome_frame/test/chrome_frame_test_utils.h" @@ -20,6 +19,7 @@ #include "chrome_frame/test/test_scrubber.h" #include "chrome_frame/test_utils.h" #include "chrome_frame/utils.h" +#include "components/variations/entropy_provider.h" // To enable ATL-based code to run in this module class ChromeFrameUnittestsModule |