Move [Get|Set]WebStoreLogin methods from ExtensionPrefs to WebstorePrivateAPI

chrome/browser/extensions/api/webstore_private/webstore_private_api.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/webstore_private/webstore_private_api.h"
 
 #include "apps/app_launcher.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 80 matching lines @@
 
 const char kAppInstallBubbleKey[] = "appInstallBubble";
 const char kEnableLauncherKey[] = "enableLauncher";
 const char kIconDataKey[] = "iconData";
 const char kIconUrlKey[] = "iconUrl";
 const char kIdKey[] = "id";
 const char kLocalizedNameKey[] = "localizedName";
 const char kLoginKey[] = "login";
 const char kManifestKey[] = "manifest";
 
+// A preference set by the web store to indicate login information for
+// purchased apps.
+const char kWebstoreLogin[] = "extensions.webstore_login";
+
 const char kCannotSpecifyIconDataAndUrlError[] =
     "You cannot specify both icon data and an icon url";
 const char kInvalidIconUrlError[] = "Invalid icon url";
 const char kInvalidIdError[] = "Invalid id";
 const char kInvalidManifestError[] = "Invalid manifest";
 const char kNoPreviousBeginInstallWithManifestError[] =
     "* does not match a previous call to beginInstallWithManifest3";
 const char kUserCancelledError[] = "User cancelled install";
 
 // Helper to create a dictionary with login properties set from the appropriate
@@ skipping 11 matching lines @@
 void EnableAppLauncher(base::Callback<void(bool)> callback) {
 #if defined(OS_WIN)
   LOG(INFO) << "Enabling App Launcher via internal enable";
   AppListService::Get()->EnableAppList();
   callback.Run(true);
 #else
   callback.Run(true);
 #endif
 }
 
+
+// We allow the web store to set a string containing login information when a
+// purchase is made, so that when a user logs into sync with a different
+// account we can recognize the situation. The Get function returns the login if
+// there was previously stored data, or an empty string otherwise. The Set will
+// overwrite any previous login.
+std::string GetWebstoreLogin(Profile* profile) {
+  if (profile->GetPrefs()->HasPrefPath(kWebstoreLogin))
+    return profile->GetPrefs()->GetString(kWebstoreLogin);
+  return std::string();
+}

[Yoyo Zhou, 2013/05/15 18:36:42]

nit: newline after

+void SetWebstoreLogin(Profile* profile, const std::string& login) {
+  profile->GetPrefs()->SetString(kWebstoreLogin, login);
+}
+
 }  // namespace
 
 // static
 void WebstorePrivateApi::SetWebstoreInstallerDelegateForTesting(
     WebstoreInstaller::Delegate* delegate) {
   test_webstore_installer_delegate = delegate;
 }
 
 // static
 scoped_ptr<WebstoreInstaller::Approval>
-    WebstorePrivateApi::PopApprovalForTesting(
-        Profile* profile, const std::string& extension_id) {
+WebstorePrivateApi::PopApprovalForTesting(
+    Profile* profile, const std::string& extension_id) {
   return g_pending_approvals.Get().PopApproval(profile, extension_id);
 }
 
 InstallBundleFunction::InstallBundleFunction() {}
 InstallBundleFunction::~InstallBundleFunction() {}
 
 bool InstallBundleFunction::RunImpl() {
   ListValue* extensions = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &extensions));
 
@@ skipping 428 matching lines @@
     LOG(ERROR) << "Error installing app launcher";
   SendResponse(ok);
 }
 
 bool GetBrowserLoginFunction::RunImpl() {
   SetResult(CreateLoginResult(profile_->GetOriginalProfile()));
   return true;
 }
 
 bool GetStoreLoginFunction::RunImpl() {
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile_)->extension_service();
-  ExtensionPrefs* prefs = service->extension_prefs();
-  std::string login;
-  if (prefs->GetWebStoreLogin(&login)) {
-    SetResult(Value::CreateStringValue(login));
-  } else {
-    SetResult(Value::CreateStringValue(std::string()));
-  }
+  SetResult(Value::CreateStringValue(GetWebstoreLogin(profile_)));
   return true;
 }
 
 bool SetStoreLoginFunction::RunImpl() {
   std::string login;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &login));
-  ExtensionService* service =
-      extensions::ExtensionSystem::Get(profile_)->extension_service();
-  ExtensionPrefs* prefs = service->extension_prefs();
-  prefs->SetWebStoreLogin(login);
+  SetWebstoreLogin(profile_, login);
   return true;
 }
 
 GetWebGLStatusFunction::GetWebGLStatusFunction() {
   feature_checker_ = new GPUFeatureChecker(
       content::GPU_FEATURE_TYPE_WEBGL,
       base::Bind(&GetWebGLStatusFunction::OnFeatureCheck,
           base::Unretained(this)));
 }
 
@@ skipping 19 matching lines @@
       &GetIsLauncherEnabledFunction::OnIsLauncherCheckCompleted, this));
   return true;
 }
 
 void GetIsLauncherEnabledFunction::OnIsLauncherCheckCompleted(bool is_enabled) {
   SetResult(Value::CreateBooleanValue(is_enabled));
   SendResponse(true);
 }
 
 }  // namespace extensions