Revert 144071 - Add a regenerate button to regenerate the password in Windows.

BUG=120480
TEST=Not tested.


Review URL: https://chromiumcodereview.appspot.com/10642009

TBR=zysxqn@google.com
Review URL: https://chromiumcodereview.appspot.com/10659022

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@144074 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 29 insertions, 0 deletions

diff --git a/rlz/test/rlz_unittest_main.cc b/rlz/test/rlz_unittest_main.cc
new file mode 100644
index 0000000..8ebbaf8
--- /dev/null
+++ b/rlz/test/rlz_unittest_main.cc
@@ -0,0 +1,29 @@
+// 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.
+//
+// Main entry point for all unit tests.
+
+#include "base/at_exit.h"
+#include "base/command_line.h"
+#include "rlz/lib/rlz_lib.h"
+#include "testing/gmock/include/gmock/gmock.h"
+#include "testing/gtest/include/gtest/gtest.h"
+
+int main(int argc, char **argv) {
+  base::AtExitManager at_exit;
+  CommandLine::Init(argc, argv);
+
+  testing::InitGoogleMock(&argc, argv);
+  testing::InitGoogleTest(&argc, argv);
+
+  int ret = RUN_ALL_TESTS();
+  if (ret == 0) {
+    // Now re-run all the tests using a supplementary brand code.  This brand
+    // code will remain in effect for the lifetime of the branding object.
+    rlz_lib::SupplementaryBranding branding("TEST");
+    ret = RUN_ALL_TESTS();
+  }
+
+  return ret;
+}