OOBE blocking AU is enabled by default.

BUG=123577 TEST=browser_tests:*UpdateScreen* Review URL: https://chromiumcodereview.appspot.com/13976004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@194012 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Apr 12, 2013 · 1fc6386 · 1fc6386
1 parent 0ab46a4
commit 1fc6386
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 11 deletions.
diff --git a/chrome/browser/chromeos/login/update_screen.cc b/chrome/browser/chromeos/login/update_screen.cc
@@ -78,8 +78,8 @@ void StartUpdateCallback(UpdateScreen* screen,
 
 // Returns true if blocking AU is enabled in command line.
 bool IsBlockingUpdateEnabledInCommandLine() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      chromeos::switches::kEnableOOBEBlockingUpdate);
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      chromeos::switches::kDisableOOBEBlockingUpdate);
 }
 
 }  // anonymous namespace

diff --git a/chrome/browser/chromeos/login/update_screen_browsertest.cc b/chrome/browser/chromeos/login/update_screen_browsertest.cc
@@ -49,9 +49,6 @@ class UpdateScreenTest : public WizardInProcessBrowserTest {
 
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    CommandLine::ForCurrentProcess()->AppendSwitch(
-        chromeos::switches::kEnableOOBEBlockingUpdate);
-
     MockDBusThreadManager* mock_dbus_thread_manager =
         new MockDBusThreadManager;
     EXPECT_CALL(*mock_dbus_thread_manager, GetSystemBus())

diff --git a/chromeos/OWNERS b/chromeos/OWNERS
@@ -1,3 +1,6 @@
+per-file chromeos_switches.cc=*
+per-file chromeos_switches.h=*
+
 zelidrag@chromium.org
 davemoore@chromium.org
 stevenjb@chromium.org

diff --git a/chromeos/chromeos_switches.cc b/chromeos/chromeos_switches.cc
@@ -13,6 +13,11 @@ const char kChromeOSReleaseBoard[] = "chromeos-release-board";
 // Forces the stub implementation of dbus clients.
 const char kDbusStub[] = "dbus-stub";
 
+// Disables portal detection and network error handling before auto
+// update.
+const char kDisableOOBEBlockingUpdate[] =
+    "disable-oobe-blocking-update";
+
 // Disables fake ethernet network in the stub implementations.
 const char kDisableStubEthernet[] = "disable-stub-ethernet";
 
@@ -23,11 +28,6 @@ const char kEnableExperimentalBluetooth[] = "enable-experimental-bluetooth";
 const char kEnableNewNetworkChangeNotifier[] =
     "enable-new-network-change-notifier";
 
-// Enables portal detection and network error handling before auto
-// update.
-const char kEnableOOBEBlockingUpdate[] =
-    "enable-oobe-blocking-update";
-
 // Enables screensaver extensions.
 const char kEnableScreensaverExtensions[] = "enable-screensaver-extensions";
 

diff --git a/chromeos/chromeos_switches.h b/chromeos/chromeos_switches.h
@@ -22,10 +22,10 @@ namespace switches {
 // Please keep alphabetized.
 CHROMEOS_EXPORT extern const char kChromeOSReleaseBoard[];
 CHROMEOS_EXPORT extern const char kDbusStub[];
+CHROMEOS_EXPORT extern const char kDisableOOBEBlockingUpdate[];
 CHROMEOS_EXPORT extern const char kDisableStubEthernet[];
 CHROMEOS_EXPORT extern const char kEnableExperimentalBluetooth[];
 CHROMEOS_EXPORT extern const char kEnableNewNetworkChangeNotifier[];
-CHROMEOS_EXPORT extern const char kEnableOOBEBlockingUpdate[];
 CHROMEOS_EXPORT extern const char kEnableScreensaverExtensions[];
 CHROMEOS_EXPORT extern const char kEnableStubInteractive[];
 CHROMEOS_EXPORT extern const char kForceLoginManagerInTests[];