Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6407)

Unified Diff: chrome/browser/extensions/updater/extension_updater_unittest.cc

Issue 803313003: Rename omaha_client and similar tokens to update_client in all contexts. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkgr
Patch Set: rebase to master Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/extensions/updater/extension_updater_unittest.cc
diff --git a/chrome/browser/extensions/updater/extension_updater_unittest.cc b/chrome/browser/extensions/updater/extension_updater_unittest.cc
index ff6d8081a239fee0bbadf9ec2a57de985d50f7d2..b1e2f519bba8afe62902d3803079427389b04e4b 100644
--- a/chrome/browser/extensions/updater/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/updater/extension_updater_unittest.cc
@@ -36,7 +36,7 @@
#include "chrome/browser/prefs/pref_service_syncable.h"
#include "chrome/test/base/testing_profile.h"
#include "components/crx_file/id_util.h"
-#include "components/omaha_client/omaha_query_params.h"
+#include "components/update_client/update_query_params.h"
#include "content/public/browser/notification_details.h"
#include "content/public/browser/notification_observer.h"
#include "content/public/browser/notification_registrar.h"
@@ -76,7 +76,7 @@
using base::Time;
using base::TimeDelta;
using content::BrowserThread;
-using omaha_client::OmahaQueryParams;
+using update_client::UpdateQueryParams;
using testing::DoAll;
using testing::Invoke;
using testing::InvokeWithoutArgs;
@@ -618,7 +618,7 @@ static void VerifyQueryAndExtractParameters(
std::map<std::string, std::string> params;
ExtractParameters(query, &params);
- std::string omaha_params = OmahaQueryParams::Get(OmahaQueryParams::CRX);
+ std::string omaha_params = UpdateQueryParams::Get(UpdateQueryParams::CRX);
std::map<std::string, std::string> expected;
ExtractParameters(omaha_params, &expected);
@@ -1896,10 +1896,8 @@ class ExtensionUpdaterTest : public testing::Test {
scoped_ptr<TestExtensionPrefs> prefs_;
ManifestFetchData* CreateManifestFetchData(const GURL& update_url) {
- return new ManifestFetchData(update_url,
- 0,
- "",
- OmahaQueryParams::Get(OmahaQueryParams::CRX),
+ return new ManifestFetchData(update_url, 0, "",
+ UpdateQueryParams::Get(UpdateQueryParams::CRX),
ManifestFetchData::PING);
}
@@ -2187,9 +2185,11 @@ TEST_F(ExtensionUpdaterTest, TestStartUpdateCheckMemory) {
MockExtensionDownloaderDelegate delegate;
ExtensionDownloader downloader(&delegate, service.request_context());
- StartUpdateCheck(&downloader, CreateManifestFetchData(GURL("http://localhost/foo")));
+ StartUpdateCheck(&downloader,
+ CreateManifestFetchData(GURL("http://localhost/foo")));
// This should delete the newly-created ManifestFetchData.
- StartUpdateCheck(&downloader, CreateManifestFetchData(GURL("http://localhost/foo")));
+ StartUpdateCheck(&downloader,
+ CreateManifestFetchData(GURL("http://localhost/foo")));
// This should add into |manifests_pending_|.
StartUpdateCheck(&downloader,
CreateManifestFetchData(GURL("http://www.google.com")));
« no previous file with comments | « chrome/browser/extensions/updater/extension_updater.cc ('k') | chrome/browser/extensions/webstore_installer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698