Do not initialize sync or policy on import process.

Do not initialize sync or policy on import process.

This fixes a conflict that occurs when the WebDataService is initialized on both the Import and normal processes
and they both try to open the same DB file.

This is a temporary fix for M26 - for M27 we will change ProfileDependencyManager to not launch any services on the
import process.

TBR=pkasting

BUG=174864
Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=184116

[Andrew T Wilson (Slow), 2013-02-21 17:08:51]

tapted: please review for overall soundness
pkasting: I've added a DCHECK to WebDataService because it should not be started
up on the import process to avoid conflicts with the main process. Please
review/rubberstamp.
joao: please stamp browser/policy change

[Andrew T Wilson (Slow), 2013-02-21 20:31:07]

BTW, this fixes an M26 release blocker, so please look at it as soon as you can.

[Joao da Silva, 2013-02-21 20:36:29]

lgtm

[tapted, 2013-02-21 23:55:48]

lgtm - this approach seems sound.

The added DCHECK is a good idea. However, note that it won't flag anything on
the bots yet due to http://crbug.com/174866 . That is, import process errors are
effectively ignored by trybots, but the DCHECK will come in handy when I fix
that.

[Andrew T Wilson (Slow), 2013-02-22 08:32:06]

OK, moving pkasting to TBR since it's just a DCHECK() in WebDataService. I
actually will probably make this a CHECK() in a future CL, since it's bad news
to ever open that file from the import process and if this starts happening we
want to know about it.

[commit-bot: I haz the power, 2013-02-22 08:32:21]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/atwilson@chromium.org/12310042/7002

[commit-bot: I haz the power, 2013-02-22 08:32:23]

Failed to apply patch for chrome/browser/policy/user_policy_signin_service.cc:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file chrome/browser/policy/user_policy_signin_service.cc
  Hunk #1 FAILED at 6.
  Hunk #2 succeeded at 17 (offset 1 line).
  Hunk #3 succeeded at 228 (offset 10 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
chrome/browser/policy/user_policy_signin_service.cc.rej

Patch:       chrome/browser/policy/user_policy_signin_service.cc
Index: chrome/browser/policy/user_policy_signin_service.cc
diff --git a/chrome/browser/policy/user_policy_signin_service.cc
b/chrome/browser/policy/user_policy_signin_service.cc
index
96c7a2e93de01bf22af13ce0d1611b0f482814bb..37fd193c98588966429af77cff667dfe71c2e453
100644
--- a/chrome/browser/policy/user_policy_signin_service.cc
+++ b/chrome/browser/policy/user_policy_signin_service.cc
@@ -6,6 +6,7 @@
 
 #include <vector>
 
+#include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
@@ -16,6 +17,7 @@
 #include "chrome/browser/policy/user_cloud_policy_manager_factory.h"
 #include "chrome/browser/policy/user_info_fetcher.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/signin/signin_manager.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/signin/token_service.h"
@@ -217,8 +219,11 @@ void CloudPolicyClientRegistrationHelper::OnClientError(
 UserPolicySigninService::UserPolicySigninService(
     Profile* profile)
     : profile_(profile) {
-  if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin))
+  CommandLine* cmd_line = CommandLine::ForCurrentProcess();
+  if (profile_->GetPrefs()->GetBoolean(prefs::kDisableCloudPolicyOnSignin) ||
+      ProfileManager::IsImportProcess(*cmd_line)) {
     return;
+  }
 
   // Initialize/shutdown the UserCloudPolicyManager when the user signs out.
   registrar_.Add(this,

[commit-bot: I haz the power, 2013-02-22 13:15:47]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/atwilson@chromium.org/12310042/2007

[commit-bot: I haz the power, 2013-02-22 14:19:48]

Retried try job too often on linux_chromeos for step(s) interactive_ui_tests
http://build.chromium.org/p/tryserver.chromium/buildstatus?builder=linux_chro...

[commit-bot: I haz the power, 2013-02-22 14:28:08]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/atwilson@chromium.org/12310042/2007

[commit-bot: I haz the power, 2013-02-22 15:07:49]

Change committed as 184116

[Peter Kasting, 2013-02-22 19:57:56]

LGTM

https://codereview.chromium.org/12310042/diff/7002/chrome/browser/webdata/web...
File chrome/browser/webdata/web_data_service.cc (right):

https://codereview.chromium.org/12310042/diff/7002/chrome/browser/webdata/web...
chrome/browser/webdata/web_data_service.cc:93:
DCHECK(!ProfileManager::IsImportProcess(*CommandLine::ForCurrentProcess()));
Nit: The comment above is for the statement below.  Move this above or below and
give it its own comment about why we need to ensure this isn't the import
process (or simply refer to an explanatory comment elsewhere).