Miscellaneous fixes to DataUse UI

chrome/browser/android/data_usage/data_use_ui_tab_model_unittest.cc

 // Copyright 2015 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/android/data_usage/data_use_ui_tab_model.h"
 
 #include <stdint.h>
 
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 159 matching lines @@
     EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(foo_tab_id));
     data_use.request_start =
         base::TimeTicks::Now() + base::TimeDelta::FromMinutes(10);
     data_use_tab_model()->GetLabelForDataUse(data_use, &got_label);
     EXPECT_EQ(std::string(), got_label) << i;
   }
 
   const SessionID::id_type bar_tab_id = foo_tab_id + 1;
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(bar_tab_id));
   data_use_ui_tab_model()->ReportCustomTabInitialNavigation(
-      bar_tab_id, std::string(), kFooPackage);
+      bar_tab_id, kFooPackage, std::string());
   base::RunLoop().RunUntilIdle();
 
   // |data_use_ui_tab_model| should receive callback about starting of
   // tracking of data usage for |bar_tab_id|.
   EXPECT_TRUE(data_use_ui_tab_model()->HasDataUseTrackingStarted(bar_tab_id));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingStarted(bar_tab_id));
   EXPECT_FALSE(data_use_ui_tab_model()->HasDataUseTrackingEnded(bar_tab_id));
 
   data_use_ui_tab_model()->ReportTabClosure(bar_tab_id);
   base::RunLoop().RunUntilIdle();
@@ skipping 140 matching lines @@
   EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
       ui::PageTransition(ui::PAGE_TRANSITION_MANUAL_SUBFRAME),
       &transition_type));
   EXPECT_FALSE(data_use_ui_tab_model()->ConvertTransitionType(
       ui::PageTransition(ui::PAGE_TRANSITION_FORM_SUBMIT), &transition_type));
 }
 
 }  // namespace android
 
 }  // namespace chrome