diff options
| author | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 03:37:55 +0000 |
|---|---|---|
| committer | thestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-17 03:37:55 +0000 |
| commit | 9cc1242b32d06505c8e9b0acacb6e0e75a166a0a (patch) | |
| tree | af60a63d8218487e1ac1471c05b021b086f589e5 | |
| parent | 79c2eeacb3d7ee8eb516abd0659a3abcd38bb0ae (diff) | |
| download | chromium_src-9cc1242b32d06505c8e9b0acacb6e0e75a166a0a.zip chromium_src-9cc1242b32d06505c8e9b0acacb6e0e75a166a0a.tar.gz chromium_src-9cc1242b32d06505c8e9b0acacb6e0e75a166a0a.tar.bz2 | |
Fix rlz_unittest after r168281.
TBR=brettw
Review URL: https://codereview.chromium.org/11412059
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168371 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/rlz/rlz_unittest.cc | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc index 2a3ca1b..b1ccca9 100644 --- a/chrome/browser/rlz/rlz_unittest.cc +++ b/chrome/browser/rlz/rlz_unittest.cc @@ -6,10 +6,9 @@ #include "base/files/scoped_temp_dir.h" #include "base/memory/scoped_ptr.h" -#include "base/stringprintf.h" #include "base/message_loop.h" #include "base/path_service.h" -#include "base/scoped_temp_dir.h" +#include "base/stringprintf.h" #include "base/threading/thread.h" #include "base/utf_string_conversions.h" #include "chrome/browser/autocomplete/autocomplete_log.h" @@ -198,13 +197,8 @@ class RlzLibTest : public testing::Test { TestRLZTracker tracker_; #if defined(OS_WIN) RegistryOverrideManager override_manager_; -<<<<<<< HEAD -#elif defined(OS_MACOSX) - base::ScopedTempDir temp_dir_; -======= #elif defined(OS_MACOSX) || defined(OS_CHROMEOS) - ScopedTempDir temp_dir_; ->>>>>>> master + base::ScopedTempDir temp_dir_; scoped_ptr<google_util::BrandForTesting> brand_override_; #endif #if defined(OS_CHROMEOS) |