Index: components/update_client/test/update_checker_unittest.cc |
diff --git a/components/component_updater/test/update_checker_unittest.cc b/components/update_client/test/update_checker_unittest.cc |
similarity index 89% |
rename from components/component_updater/test/update_checker_unittest.cc |
rename to components/update_client/test/update_checker_unittest.cc |
index 051b4fbf9677105db79002897b1f550014e3a426..20d3e79620a2a8610ec74bc1c5fb804d72d465c9 100644 |
--- a/components/component_updater/test/update_checker_unittest.cc |
+++ b/components/update_client/test/update_checker_unittest.cc |
@@ -13,25 +13,28 @@ |
#include "base/path_service.h" |
#include "base/run_loop.h" |
#include "base/version.h" |
-#include "components/component_updater/crx_update_item.h" |
-#include "components/component_updater/test/test_configurator.h" |
-#include "components/component_updater/test/url_request_post_interceptor.h" |
-#include "components/component_updater/update_checker.h" |
+#include "components/update_client/crx_update_item.h" |
+#include "components/update_client/test/test_configurator.h" |
+#include "components/update_client/test/url_request_post_interceptor.h" |
+#include "components/update_client/update_checker.h" |
#include "net/url_request/url_request_test_util.h" |
#include "testing/gtest/include/gtest/gtest.h" |
#include "url/gurl.h" |
using std::string; |
-namespace component_updater { |
+namespace update_client { |
namespace { |
base::FilePath test_file(const char* file) { |
base::FilePath path; |
PathService::Get(base::DIR_SOURCE_ROOT, &path); |
- return path.AppendASCII("components").AppendASCII("test").AppendASCII("data") |
- .AppendASCII("component_updater").AppendASCII(file); |
+ return path.AppendASCII("components") |
+ .AppendASCII("test") |
+ .AppendASCII("data") |
+ .AppendASCII("update_client") |
+ .AppendASCII(file); |
} |
} // namespace |
@@ -170,8 +173,7 @@ TEST_F(UpdateCheckerTest, UpdateCheckSuccess) { |
items_to_check.push_back(&item); |
update_checker_->CheckForUpdates( |
- items_to_check, |
- "extra=\"params\"", |
+ items_to_check, "extra=\"params\"", |
base::Bind(&UpdateCheckerTest::UpdateCheckComplete, |
base::Unretained(this))); |
@@ -183,10 +185,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckSuccess) { |
<< post_interceptor_->GetRequestsAsString(); |
// Sanity check the request. |
- EXPECT_NE( |
- string::npos, |
- post_interceptor_->GetRequests()[0].find( |
- "request protocol=\"3.0\" extra=\"params\"")); |
+ EXPECT_NE(string::npos, post_interceptor_->GetRequests()[0].find( |
+ "request protocol=\"3.0\" extra=\"params\"")); |
EXPECT_NE( |
string::npos, |
post_interceptor_->GetRequests()[0].find( |
@@ -218,10 +218,8 @@ TEST_F(UpdateCheckerTest, UpdateCheckError) { |
items_to_check.push_back(&item); |
update_checker_->CheckForUpdates( |
- items_to_check, |
- "", |
- base::Bind(&UpdateCheckerTest::UpdateCheckComplete, |
- base::Unretained(this))); |
+ items_to_check, "", base::Bind(&UpdateCheckerTest::UpdateCheckComplete, |
+ base::Unretained(this))); |
RunThreads(); |
@@ -236,4 +234,4 @@ TEST_F(UpdateCheckerTest, UpdateCheckError) { |
EXPECT_EQ(0ul, results_.list.size()); |
} |
-} // namespace component_updater |
+} // namespace update_client |