Add reverse URL handler for shortening uber URLs

chrome/browser/chrome_content_browser_client_browsertest.cc

+// 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.
+
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/browser/ui/tab_contents/tab_contents.h"
+#include "content/public/browser/navigation_controller.h"
+#include "content/public/browser/navigation_entry.h"
+#include "content/public/browser/web_contents.h"
+#include "googleurl/src/gurl.h"
+
+#include <string>

[Alexei Svitkine (slow), 2012/08/10 19:13:56]

This should be above the other includes.

+
+using content::NavigationEntry;

[Alexei Svitkine (slow), 2012/08/10 19:13:56]

Put the test into the content namespace and removing the using declaration.

+
+class ChromeContentBrowserClientBrowserTest : public InProcessBrowserTest {
+ public:
+  NavigationEntry* GetLastCommittedEntry() {

[Alexei Svitkine (slow), 2012/08/10 19:13:56]

Add a comment.

+    return chrome::GetTabContentsAt(browser(), 0)->web_contents()

[Alexei Svitkine (slow), 2012/08/10 19:13:56]

Is there a guarantee that nothing in the deref chain will be NULL?

[Cem Kocagil, 2012/08/11 16:41:30]

Before and after we navigate there should be one tab, so GetTabContentsAt()
won't return NULL. This should own a WebContents, so web_contents() won't be
NULL. GetController() returns a reference which can't be NULL. I think
GetLastCommittedEntry() might return a NULL pointer if no entry is committed
(not sure but this might be possible by adding a blank tab), so the test checks
this value.

+        ->GetController().GetLastCommittedEntry();
+  }
+};
+
+IN_PROC_BROWSER_TEST_F(ChromeContentBrowserClientBrowserTest, UberURLHandler) {
+  const GURL url1_short(std::string("chrome://settings/"));
+  const GURL url1_long(std::string("chrome://chrome/settings/"));
+
+  const GURL url2_short(std::string("chrome://settings/content"));
+  const GURL url2_long(std::string("chrome://chrome/settings/content"));
+
+  ui_test_utils::NavigateToURL(browser(), url1_short);
+  NavigationEntry* entry = GetLastCommittedEntry();
+
+  ASSERT_TRUE(entry != NULL);
+  EXPECT_EQ(url1_long, entry->GetURL());
+  EXPECT_EQ(url1_short, entry->GetVirtualURL());
+
+  ui_test_utils::NavigateToURL(browser(), url2_short);
+  entry = GetLastCommittedEntry();
+
+  ASSERT_TRUE(entry != NULL);
+  EXPECT_EQ(url2_long, entry->GetURL());
+  EXPECT_EQ(url2_short, entry->GetVirtualURL());
+}