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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/profiles/profile_impl.cc

Issue 7554021: Exposed test hooks for replacing GAIA auth extension. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 5 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
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/gaia_auth/manifest_test.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/profile_impl.cc
===================================================================
--- chrome/browser/profiles/profile_impl.cc (revision 95152)
+++ chrome/browser/profiles/profile_impl.cc (working copy)
@@ -559,23 +559,17 @@
FILE_PATH_LITERAL("/usr/share/chromeos-assets/mobile"),
IDR_MOBILE_MANIFEST));
-#ifndef NDEBUG
if (command_line->HasSwitch(switches::kAuthExtensionPath)) {
FilePath auth_extension_path =
command_line->GetSwitchValuePath(switches::kAuthExtensionPath);
component_extensions.push_back(std::make_pair(
auth_extension_path.value(),
- IDR_GAIA_AUTH_MANIFEST));
+ IDR_GAIA_TEST_AUTH_MANIFEST));
} else {
component_extensions.push_back(std::make_pair(
FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"),
IDR_GAIA_AUTH_MANIFEST));
}
-#else
- component_extensions.push_back(std::make_pair(
- FILE_PATH_LITERAL("/usr/share/chromeos-assets/gaia_auth"),
- IDR_GAIA_AUTH_MANIFEST));
-#endif
#if defined(OFFICIAL_BUILD)
if (browser_defaults::enable_help_app) {
« no previous file with comments | « chrome/browser/browser_resources.grd ('k') | chrome/browser/resources/gaia_auth/manifest_test.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698