Revert of Hook up the Mac password bubble to the browser and add browser tests.

chrome/browser/password_manager/chrome_password_manager_client.cc

 // Copyright 2014 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/password_manager/chrome_password_manager_client.h"
 
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/memory/singleton.h"
 #include "base/metrics/histogram.h"
@@ skipping 386 matching lines @@
     return false;
 
   // "rart" is the transactional reauth paramter.
   std::string ignored_value;
   return net::GetValueForKeyInQuery(entry->GetURL(),
                                     "rart",
                                     &ignored_value);
 }
 
 bool ChromePasswordManagerClient::IsTheHotNewBubbleUIEnabled() {
+#if !defined(USE_AURA)
+  return false;
+#endif
   CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kDisableSavePasswordBubble))
     return false;
 
   if (command_line->HasSwitch(switches::kEnableSavePasswordBubble))
     return true;
 
   std::string group_name =
       base::FieldTrialList::FindFullName("PasswordManagerUI");
 
@@ skipping 41 matching lines @@
 
   if (group_name == "DisallowSyncCredentialsForReauth") {
     autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS_FOR_REAUTH;
   } else if (group_name == "DisallowSyncCredentials") {
       autofill_sync_state_ = DISALLOW_SYNC_CREDENTIALS;
   } else {
     // Allow by default.
     autofill_sync_state_ = ALLOW_SYNC_CREDENTIALS;
   }
 }