Change the SearchBox API from using the start/end margins of the location bar to using the start ma…

chrome/browser/instant/instant_extended_browsertest.cc

 // Copyright 2013 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/instant/instant_commit_type.h"
 #include "chrome/browser/instant/instant_ntp.h"
 #include "chrome/browser/instant/instant_overlay.h"
 #include "chrome/browser/instant/instant_service.h"
 #include "chrome/browser/instant/instant_service_factory.h"
 #include "chrome/browser/instant/instant_test_utils.h"
+#include "chrome/browser/prefs/pref_service.h"
+#include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/search/search.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_notification_types.h"
+#include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/test/base/interactive_test_utils.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/web_contents.h"
 
 class InstantExtendedTest : public InstantTestBase {
  protected:
   virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
@@ skipping 310 matching lines @@
   content::WebContents* active_tab =
       browser()->tab_strip_model()->GetActiveWebContents();
   EXPECT_TRUE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 
   // Navigating elsewhere should not use the Instant render process.
   ui_test_utils::NavigateToURL(browser(), GURL(chrome::kChromeUIAboutURL));
   EXPECT_FALSE(instant_service->IsInstantProcess(
       active_tab->GetRenderProcessHost()->GetID()));
 }
+
+// Check that toggling the state of the home button changes the start-edge
+// margin and width.
+IN_PROC_BROWSER_TEST_F(InstantExtendedTest, HomeButtonAffectsMargin) {
+  ASSERT_NO_FATAL_FAILURE(SetupInstant());
+
+  // Get the current value of the start-edge margin and width.
+  int startMargin;

[sreeram, 2013/02/14 18:26:57]

start_margin

[melevin, 2013/02/19 22:00:49]

Oops, went into JavaScript mode...

+  int width;
+  content::WebContents* preview_tab = instant()->GetPreviewContents();
+  EXPECT_TRUE(GetIntFromJS(preview_tab, "chrome.searchBox.startMargin",
+      &startMargin));
+  EXPECT_TRUE(GetIntFromJS(preview_tab, "chrome.searchBox.width", &width));
+
+  // Toggle the home button visibility pref.
+  PrefService* profile_prefs = browser()->profile()->GetPrefs();
+  bool showHome = profile_prefs->GetBoolean(prefs::kShowHomeButton);
+  profile_prefs->SetBoolean(prefs::kShowHomeButton, !showHome);
+
+  // Make sure the margin and width changed.
+  int newStartMargin;
+  int newWidth;

[sreeram, 2013/02/14 18:26:57]

new_start_margin
new_width

[melevin, 2013/02/19 22:00:49]

Done.

+  EXPECT_TRUE(GetIntFromJS(preview_tab, "chrome.searchBox.startMargin",
+      &newStartMargin));
+  EXPECT_TRUE(GetIntFromJS(preview_tab, "chrome.searchBox.width", &newWidth));
+  EXPECT_NE(startMargin, newStartMargin);
+  EXPECT_NE(width, newWidth);
+  EXPECT_EQ(newWidth - width, startMargin - newStartMargin);
+}