Index: chrome/browser/rlz/rlz_unittest.cc |
diff --git a/chrome/browser/rlz/rlz_unittest.cc b/chrome/browser/rlz/rlz_unittest.cc |
index 6c1981817882a021a1cfc599403c8f7bc8cb5a90..f043163e9dcb0d0def34023d94349b6c8be56905 100644 |
--- a/chrome/browser/rlz/rlz_unittest.cc |
+++ b/chrome/browser/rlz/rlz_unittest.cc |
@@ -4,10 +4,10 @@ |
#include "chrome/browser/rlz/rlz.h" |
+#include "base/files/scoped_temp_dir.h" |
#include "base/memory/scoped_ptr.h" |
-#include "base/stringprintf.h" |
#include "base/path_service.h" |
-#include "base/scoped_temp_dir.h" |
+#include "base/stringprintf.h" |
#include "base/utf_string_conversions.h" |
#include "chrome/browser/autocomplete/autocomplete_log.h" |
#include "chrome/browser/google/google_util.h" |
@@ -17,8 +17,8 @@ |
#include "chrome/installer/util/browser_distribution.h" |
#include "chrome/installer/util/google_update_constants.h" |
#include "content/public/browser/navigation_entry.h" |
-#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_details.h" |
+#include "content/public/browser/notification_service.h" |
#include "content/public/browser/notification_source.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -174,7 +174,7 @@ class RlzLibTest : public testing::Test { |
#if defined(OS_WIN) |
RegistryOverrideManager override_manager_; |
#elif defined(OS_MACOSX) |
- ScopedTempDir temp_dir_; |
+ base::ScopedTempDir temp_dir_; |
scoped_ptr<google_util::BrandForTesting> brand_override_; |
#endif |
}; |