DevTools: Made id unique across different remote browsers

chrome/browser/devtools/device/adb/adb_client_socket_browsertest.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/devtools/device/adb/adb_device_provider.h"
 #include "chrome/browser/devtools/device/adb/mock_adb_server.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ skipping 83 matching lines @@
     ASSERT_EQ("4.0", webview->version());
 
     std::vector<DevToolsAndroidBridge::RemotePage*> chrome_pages =
         chrome->CreatePages();
     std::vector<DevToolsAndroidBridge::RemotePage*> chrome_beta_pages =
         chrome_beta->CreatePages();
     std::vector<DevToolsAndroidBridge::RemotePage*> webview_pages =
         webview->CreatePages();
 
     ASSERT_EQ(1U, chrome_pages.size());
-    ASSERT_EQ(0U, chrome_beta_pages.size());
+    ASSERT_EQ(1U, chrome_beta_pages.size());
     ASSERT_EQ(2U, webview_pages.size());
 
     // Check that we have non-empty description for webview pages.
     ASSERT_EQ(0U, chrome_pages[0]->GetTarget()->GetDescription().size());
+    ASSERT_EQ(0U, chrome_beta_pages[0]->GetTarget()->GetDescription().size());
     ASSERT_NE(0U, webview_pages[0]->GetTarget()->GetDescription().size());
     ASSERT_NE(0U, webview_pages[1]->GetTarget()->GetDescription().size());
 
     ASSERT_EQ(GURL("http://www.chromium.org/"),
                    chrome_pages[0]->GetTarget()->GetURL());
     ASSERT_EQ("The Chromium Projects",
               chrome_pages[0]->GetTarget()->GetTitle());
 
     STLDeleteElements(&chrome_pages);
+    STLDeleteElements(&chrome_beta_pages);
     STLDeleteElements(&webview_pages);
   }
 
  private:
   scoped_refptr<DevToolsAndroidBridge> android_bridge_;
   DevToolsAndroidBridge::RemoteDevices devices_;
 };
 
 IN_PROC_BROWSER_TEST_F(AdbClientSocketTest, TestAdbClientSocket) {
   StartMockAdbServer();
   StartTest();
   CheckDevices();
   StopMockAdbServer();
 }